From a7baf505c57cc561a221f9df265a9c62df5aa748 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gunb.ai>
Date: Sat, 2 May 2026 16:51:27 -0400
Subject: [PATCH 01/18] WIP: keen-swift-519

---
 ...n-approximate-field-real-parameter-stop.md | 71 +++++++++++++++++
 .../m2_substrate_inhabitance_test.rs          | 76 ++++++++++++++++++-
 src/v3/std/approximate_field.dag              | 43 +++++++++--
 3 files changed, 181 insertions(+), 9 deletions(-)
 create mode 100644 docs/audit/t-numeric-construction-approximate-field-real-parameter-stop.md

diff --git a/docs/audit/t-numeric-construction-approximate-field-real-parameter-stop.md b/docs/audit/t-numeric-construction-approximate-field-real-parameter-stop.md
new file mode 100644
index 00000000000..30a2731c693
--- /dev/null
+++ b/docs/audit/t-numeric-construction-approximate-field-real-parameter-stop.md
@@ -0,0 +1,71 @@
+# STOP — `Real = ApproximateField<Rational>` vs landed `Rational` witness (T-Numeric prep)
+
+**Lane:** R3 #6 (T-Numeric-Construction). **Artifacts:**
+[`docs/design-numeric-construction.md`](../design-numeric-construction.md),
+[`docs/audit/t-numeric-construction-approximate-field-6q.md`](t-numeric-construction-approximate-field-6q.md),
+landed axes `src/v3/std/approximate_field.dag` (#1427), landed
+`dsl/std/rational.dag` — `Rational = Field<FieldOfFractions<Int>>` (#1508).
+
+**Status:** **STOP for the Real alias slice** until the type-parameter convention is
+resolved. This receipt does **not** block the parametric carrier
+`ApproximateField<F>` / `SpecialValues` precursor (orthogonal substrate facts).
+
+## What is honest today
+
+- `Field<T>` in `dsl/std/algebra.dag` is parameterized by **carrier** `T`
+  (elements of the field).
+- Slice 4 pins `Rational` as **`Field<FieldOfFractions<Int>>`** — i.e. `Rational`
+  names the **algebra witness** applied to carrier `FieldOfFractions<Int>`, not a
+  bare carrier (see `dsl/std/rational.dag` and FoF 6Q Q6).
+- The 6Q carrier sketch fixes `ApproximateField<F>` with **`base: Field<F>`** where
+  **`F` is the same carrier slot as in `Field<F>`** — exact field operations live
+  under `Field<F>`; rounding / precision / specials / subnormals are orthogonal.
+
+## Why `Real = ApproximateField<Rational>` is not structurally honest as written
+
+If one substitutes **`F := Rational`** into `ApproximateField<F>`:
+
+1. `base` becomes **`Field<Rational>`**.
+2. Under substrate parsing, that expands to **`Field< Field<FieldOfFractions<Int>> >`** —
+   `Field` applied to a type that is **already** a `Field<…>` instantiation.
+3. That is **not** the intended math layering (“approximate ℚ then ℝ”): it nests a
+   second `Field` around the **witness type**, not around the **fraction carrier**.
+
+So the phrase **`ApproximateField<Rational>`** collides with **`Rational =
+Field<FieldOfFractions<Int>>`**: `Rational` is not in the same semantic class as
+the `F` in `Field<F>`.
+
+The design doc chain still shows **`Real = ApproximateField<Rational>`** and an
+outdated `Rational = Field<Int>` sketch (`docs/design-numeric-construction.md` §chain).
+Those lines need a **single-authority edit** together with the convention picked
+below — **not** attempted silently in the carrier-only slice.
+
+## Missing sub-carriers / decisions (before Real alias lands)
+
+Pick **one** convention and encode it in design + ratchet tests:
+
+| Option | Real spelling (example) | Notes |
+|--------|-------------------------|--------|
+| **A — Carrier-parameter honesty** | `Real = ApproximateField<FieldOfFractions<Int>>` | Matches `base: Field<FieldOfFractions<Int>>` ≡ alias `Rational`. User-facing name “Real approximates ℚ” is documentation + alias ergonomics, not the type argument to `ApproximateField`. |
+| **B — Separate carrier alias** | Introduce e.g. `RationalCarrier = FieldOfFractions<Int>` in `dsl/std/rational.dag`, keep `Rational = Field<RationalCarrier>`, then `Real = ApproximateField<RationalCarrier>` | Keeps `ApproximateField`’s `F` visibly “carrier-shaped”; avoids repeating `FieldOfFractions<Int>` at Real. |
+| **C — Reparameterize ApproximateField** | Change carrier shape so the parameter means “exact field alias” instead of `Field`’s carrier | Larger substrate/design churn; must restate 6Q §carrier sketch and any ratchets already authored against `base: Field<F>`. |
+
+Until **one row** is ratified, **`Real = ApproximateField<Rational>`** must not ship as
+a substrate claim — it either mis-instantiates `Field<F>` or smuggles witness/carrier
+confusion.
+
+## Explicit non-goals (Director dispatch)
+
+Unchanged from approximate-field 6Q and inbox: **no** Float migration, **no** target
+mirrors, **no** tolerance runner / cross-target float equivalence, **no** consumer
+cascade in the carrier-prep lane.
+
+## Dissolution trigger
+
+Close this STOP when:
+
+1. Design doc + numeric-construction chain reflect Slice 4 `Rational` and the
+   chosen Real spelling; and
+2. A substrate ratchet test asserts the `ApproximateField` parameter binds to the
+   chosen carrier (or the revised carrier convention), analogous to Slice 4’s
+   two-step `Rational` witness ratchet.
diff --git a/src/v3/compiler/tests/integration/m2_substrate_inhabitance_test.rs b/src/v3/compiler/tests/integration/m2_substrate_inhabitance_test.rs
index c99f0fe5708..5ba1d2cfea0 100644
--- a/src/v3/compiler/tests/integration/m2_substrate_inhabitance_test.rs
+++ b/src/v3/compiler/tests/integration/m2_substrate_inhabitance_test.rs
@@ -2864,18 +2864,90 @@ fn approximate_field_axes_live_in_v3_std_authority() {
         "InfinityPolicy",
         "SignedZeroPolicy",
         "SubnormalPolicy",
+        "SpecialValues",
+        "ApproximateField",
     ] {
         let decl = dag
             .declaration_by_name(name)
             .unwrap_or_else(|| panic!("`{name}` missing from full bootstrap"));
         assert_eq!(
             decl.span.file, "src/v3/std/approximate_field.dag",
-            "`{name}` must stay in the approximate-field axes precursor; the \
-             full ApproximateField carrier and Float migration land later"
+            "`{name}` must stay in the single approximate-field authority module"
         );
     }
 }
 
+/// T-Numeric-Construction — `ApproximateField<F>` carrier introduction per 6Q audit
+/// (`SpecialValues` + `ApproximateField<F>` slice). Pins `base: Field<F>` with `F`
+/// as the carrier parameter matching `dsl/std/algebra.dag`'s `Field<T>`.
+///
+/// **Does not** assert `Real = …` — see `docs/audit/t-numeric-construction-approximate-field-real-parameter-stop.md`.
+#[test]
+fn approximate_field_carrier_record_shape_ratchets() {
+    let dag = v3_compiler::generated_full_bootstrap_dag();
+
+    let approx_id = find_named(dag, "ApproximateField");
+    let field_template = dag
+        .declaration_by_name("Field")
+        .expect("`Field` must load from dsl/std/algebra.dag");
+
+    let mut labels = record_fields(dag, "ApproximateField");
+    labels.sort();
+    assert_eq!(
+        labels,
+        vec![
+            "base".to_string(),
+            "precision".to_string(),
+            "rounding".to_string(),
+            "special_values".to_string(),
+            "subnormal_policy".to_string(),
+        ],
+        "`ApproximateField<F>` must carry exactly the five 6Q axes"
+    );
+
+    let approx_decl = dag.declaration(approx_id);
+    assert_eq!(
+        approx_decl.type_params.len(),
+        1,
+        "ApproximateField<F> takes exactly one carrier type parameter"
+    );
+
+    let base_ty = conj_field_by_id(dag, approx_id, "base");
+    match &dag.declaration(base_ty).connective {
+        TypeConnective::Instantiation {
+            template,
+            arguments,
+        } => {
+            assert_eq!(
+                *template, field_template.id,
+                "`base` must instantiate `Field<F>`, not an ad hoc record"
+            );
+            assert_eq!(
+                arguments.len(),
+                1,
+                "`Field<F>` carries exactly one type argument"
+            );
+            assert_eq!(
+                arguments[0].parameter, approx_decl.type_params[0],
+                "`Field`'s argument must bind `ApproximateField`'s `<F>` carrier parameter"
+            );
+        }
+        other => panic!("`base` must lower to a Field instantiation; got {other:?}"),
+    }
+
+    let mut sv_labels = record_fields(dag, "SpecialValues");
+    sv_labels.sort();
+    assert_eq!(
+        sv_labels,
+        vec![
+            "infinity".to_string(),
+            "nan".to_string(),
+            "signed_zero".to_string(),
+        ],
+        "`SpecialValues` aggregates nan / infinity / signed-zero policy only"
+    );
+}
+
 #[test]
 fn rounding_mode_axis_is_closed_sum() {
     let dag = v3_compiler::generated_full_bootstrap_dag();
diff --git a/src/v3/std/approximate_field.dag b/src/v3/std/approximate_field.dag
index 04d222f9ab8..efeec09c38b 100644
--- a/src/v3/std/approximate_field.dag
+++ b/src/v3/std/approximate_field.dag
@@ -1,14 +1,21 @@
-// v3.std.approximate_field - typed axes for approximate real arithmetic.
+// v3.std.approximate_field - typed axes + parametric carrier for approximate reals.
 //
-// Authority: docs/design-numeric-construction.md section 5 and
-// docs/audit/t-numeric-construction-approximate-field-6q.md. This file lands
-// only the independent axes precursor. The `ApproximateField<F>` carrier,
-// `SpecialValues` record, `Real = ApproximateField<Rational>` alias, Float
-// migration, target mirrors, and tolerance/equivalence behavior land in later
-// slices.
+// Authority: docs/design-numeric-construction.md §5 and
+// docs/audit/t-numeric-construction-approximate-field-6q.md (slice plan).
+//
+// Landed axes precursor (#1427): rounding / precision / special-value policy
+// terminals. **Carrier slice (this file):** `SpecialValues` + `ApproximateField<F>`
+// per 6Q §“Recommended substrate shape” — still **no** `Real` alias, Float
+// migration, target mirrors, or tolerance/equivalence behavior.
+//
+// **Real alias gate:** `docs/audit/t-numeric-construction-approximate-field-real-parameter-stop.md`
+// — `Rational` (#1508) names `Field<FieldOfFractions<Int>>`, so `F` in
+// `ApproximateField<F>` / `base: Field<F>` cannot honestly be spelled `Rational`
+// without a design convention fix (carrier vs witness naming).
 
 module v3.std.approximate_field
 
+import std.algebra { Field }
 import std.types { PositiveInt }
 
 // 🟢 TERMINAL at approximate-arithmetic policy scope. Rounding behavior is a
@@ -49,3 +56,25 @@ type SignedZeroPolicy = NoSignedZero | SignedZero
 // independent closed policy axis; the later carrier slice can aggregate it
 // without adding new policy vocabulary.
 type SubnormalPolicy = NoSubnormals | GradualUnderflow | FlushToZero
+
+// Closed record aggregating the three orthogonal special-value policy axes (NaN,
+// infinity, signed zero). Subnormal/denormal policy stays a separate field on
+// `ApproximateField<F>` per 6Q — it affects underflow behavior, not merely
+// presence of exceptional values.
+type SpecialValues {
+  nan: NanPolicy
+  infinity: InfinityPolicy
+  signed_zero: SignedZeroPolicy
+}
+
+// Approximate field over an **exact** field algebra `Field<F>` where `F` is the
+// same carrier type parameter as in `dsl/std/algebra.dag`'s `Field<T>`.
+//
+// Observable approximation policies are structural (no target-string tags).
+type ApproximateField<F> {
+  base: Field<F>
+  rounding: RoundingMode
+  precision: Precision
+  special_values: SpecialValues
+  subnormal_policy: SubnormalPolicy
+}

From cd7904204ba4750d13e9d17abd8f65a0f326573f Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gunb.ai>
Date: Sat, 2 May 2026 12:13:30 -0400
Subject: [PATCH 02/18] WIP: keen-swift-519

---
 src/v3/compiler/src/bootstrap_generated.rs    | 8868 +++++++++--------
 ...otstrap_generated_without_parse_surface.rs | 8056 +++++++--------
 2 files changed, 8562 insertions(+), 8362 deletions(-)

diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs
index e9ca00cf58f..41134e2e077 100644
--- a/src/v3/compiler/src/bootstrap_generated.rs
+++ b/src/v3/compiler/src/bootstrap_generated.rs
@@ -8,7 +8,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag {
         ports: bootstrapped_fixture_dag_ports(),
         diagnostics: bootstrapped_fixture_dag_diagnostics(),
         next_node_id: 275,
-        next_declaration_id: 2261,
+        next_declaration_id: 2265,
         next_port_id: 371,
         primitives: PrimitiveCache::default(),
         substrate_markers: SubstrateMarkers::default(),
@@ -23,7 +23,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag {
         callable_strategy_variants: CallableStrategyVariants::default(),
         clusters: bootstrapped_fixture_dag_clusters(),
         optional_match_disjs: bootstrapped_fixture_dag_optional_match_disjs(),
-        declaration_append_begin_after_bootstrap: 2261,
+        declaration_append_begin_after_bootstrap: 2265,
     }
 }
 
@@ -118,21 +118,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(7),
-            target: TransformTarget::Callable(DeclarationId(1724)),
+            target: TransformTarget::Callable(DeclarationId(1727)),
             inputs: vec![PortId(9)],
             output: PortId(11),
             span: SourceSpan::new("src/v3/std/algebra.dag", 10402, 10414),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(8),
-            target: TransformTarget::Callable(DeclarationId(1726)),
+            target: TransformTarget::Callable(DeclarationId(1729)),
             inputs: vec![PortId(11)],
             output: PortId(12),
             span: SourceSpan::new("src/v3/std/algebra.dag", 10395, 10442),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(9),
-            target: TransformTarget::Callable(DeclarationId(1686)),
+            target: TransformTarget::Callable(DeclarationId(1689)),
             inputs: vec![PortId(9), PortId(10), PortId(12)],
             output: PortId(13),
             span: SourceSpan::new("src/v3/std/algebra.dag", 10056, 10446),
@@ -148,7 +148,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(11),
-            target: TransformTarget::Callable(DeclarationId(1688)),
+            target: TransformTarget::Callable(DeclarationId(1691)),
             inputs: vec![PortId(14), PortId(15), PortId(16)],
             output: PortId(17),
             span: SourceSpan::new("src/v3/std/algebra.dag", 10577, 10633),
@@ -164,7 +164,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(13),
-            target: TransformTarget::Callable(DeclarationId(1727)),
+            target: TransformTarget::Callable(DeclarationId(1730)),
             inputs: vec![PortId(18)],
             output: PortId(19),
             span: SourceSpan::new("src/v3/std/algebra.dag", 10702, 10717),
@@ -317,7 +317,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(27),
-            target: TransformTarget::Callable(DeclarationId(1721)),
+            target: TransformTarget::Callable(DeclarationId(1724)),
             inputs: vec![PortId(35)],
             output: PortId(36),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11232, 11256),
@@ -347,7 +347,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(31),
-            target: TransformTarget::Callable(DeclarationId(1719)),
+            target: TransformTarget::Callable(DeclarationId(1722)),
             inputs: vec![PortId(40)],
             output: PortId(41),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11525, 11560),
@@ -477,14 +477,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(43),
-            target: TransformTarget::Callable(DeclarationId(1715)),
+            target: TransformTarget::Callable(DeclarationId(1718)),
             inputs: vec![PortId(54)],
             output: PortId(55),
             span: SourceSpan::new("src/v3/std/algebra.dag", 13121, 13136),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(44),
-            target: TransformTarget::Callable(DeclarationId(1729)),
+            target: TransformTarget::Callable(DeclarationId(1732)),
             inputs: vec![PortId(53), PortId(55)],
             output: PortId(56),
             span: SourceSpan::new("src/v3/std/algebra.dag", 13109, 13152),
@@ -1194,7 +1194,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(91),
-            target: TransformTarget::Callable(DeclarationId(1731)),
+            target: TransformTarget::Callable(DeclarationId(1734)),
             inputs: vec![PortId(136), PortId(137)],
             output: PortId(138),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15818, 15928),
@@ -1222,7 +1222,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(95),
-            target: TransformTarget::Callable(DeclarationId(1733)),
+            target: TransformTarget::Callable(DeclarationId(1736)),
             inputs: vec![PortId(141), PortId(142)],
             output: PortId(143),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15983, 16093),
@@ -1525,7 +1525,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
             id: NodeId(113),
             target: TransformTarget::FieldProject {
                 field_label: "rest".to_string(),
-                field_child: Some(DeclarationId(1500)),
+                field_child: Some(DeclarationId(1503)),
             },
             inputs: vec![PortId(161)],
             output: PortId(164),
@@ -1533,14 +1533,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(114),
-            target: TransformTarget::Callable(DeclarationId(1734)),
+            target: TransformTarget::Callable(DeclarationId(1737)),
             inputs: vec![PortId(163), PortId(164)],
             output: PortId(165),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17366, 17396),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(115),
-            target: TransformTarget::Callable(DeclarationId(1735)),
+            target: TransformTarget::Callable(DeclarationId(1738)),
             inputs: vec![PortId(162), PortId(165)],
             output: PortId(166),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17348, 17397),
@@ -1556,7 +1556,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(117),
-            target: TransformTarget::Callable(DeclarationId(1736)),
+            target: TransformTarget::Callable(DeclarationId(1739)),
             inputs: vec![],
             output: PortId(168),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17667, 17674),
@@ -1624,7 +1624,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(125),
-            target: TransformTarget::Callable(DeclarationId(1737)),
+            target: TransformTarget::Callable(DeclarationId(1740)),
             inputs: vec![PortId(174), PortId(176)],
             output: PortId(177),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17792, 17835),
@@ -1871,7 +1871,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(141),
-            target: TransformTarget::Callable(DeclarationId(1715)),
+            target: TransformTarget::Callable(DeclarationId(1718)),
             inputs: vec![PortId(199)],
             output: PortId(200),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18968, 18983),
@@ -1918,7 +1918,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(146),
-            target: TransformTarget::Callable(DeclarationId(1738)),
+            target: TransformTarget::Callable(DeclarationId(1741)),
             inputs: vec![PortId(205), PortId(206)],
             output: PortId(207),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19105, 19137),
@@ -2015,7 +2015,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(153),
-            target: TransformTarget::Callable(DeclarationId(1715)),
+            target: TransformTarget::Callable(DeclarationId(1718)),
             inputs: vec![PortId(213)],
             output: PortId(214),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19239, 19254),
@@ -2079,7 +2079,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(160),
-            target: TransformTarget::Callable(DeclarationId(1721)),
+            target: TransformTarget::Callable(DeclarationId(1724)),
             inputs: vec![PortId(222)],
             output: PortId(223),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19357, 19416),
@@ -2162,7 +2162,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(165),
-            target: TransformTarget::Callable(DeclarationId(1715)),
+            target: TransformTarget::Callable(DeclarationId(1718)),
             inputs: vec![PortId(227)],
             output: PortId(228),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19705, 19720),
@@ -2263,7 +2263,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(176),
-            target: TransformTarget::Callable(DeclarationId(1719)),
+            target: TransformTarget::Callable(DeclarationId(1722)),
             inputs: vec![PortId(241)],
             output: PortId(242),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19947, 20010),
@@ -2735,7 +2735,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(205),
-            target: TransformTarget::Callable(DeclarationId(1719)),
+            target: TransformTarget::Callable(DeclarationId(1722)),
             inputs: vec![PortId(291)],
             output: PortId(292),
             span: SourceSpan::new("src/v3/std/algebra.dag", 21393, 21421),
@@ -2830,7 +2830,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(216),
-            target: TransformTarget::Callable(DeclarationId(1739)),
+            target: TransformTarget::Callable(DeclarationId(1742)),
             inputs: vec![],
             output: PortId(305),
             span: SourceSpan::new("src/v3/std/algebra.dag", 21776, 21783),
@@ -2898,7 +2898,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(224),
-            target: TransformTarget::Callable(DeclarationId(1740)),
+            target: TransformTarget::Callable(DeclarationId(1743)),
             inputs: vec![PortId(311), PortId(313)],
             output: PortId(314),
             span: SourceSpan::new("src/v3/std/algebra.dag", 21924, 21989),
@@ -2987,7 +2987,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(230),
-            target: TransformTarget::Callable(DeclarationId(1742)),
+            target: TransformTarget::Callable(DeclarationId(1745)),
             inputs: vec![PortId(318), PortId(320)],
             output: PortId(321),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22107, 22165),
@@ -3008,7 +3008,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(233),
-            target: TransformTarget::Callable(DeclarationId(1743)),
+            target: TransformTarget::Callable(DeclarationId(1746)),
             inputs: vec![PortId(319), PortId(323)],
             output: PortId(324),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22191, 22237),
@@ -3051,14 +3051,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(236),
-            target: TransformTarget::Callable(DeclarationId(1744)),
+            target: TransformTarget::Callable(DeclarationId(1747)),
             inputs: vec![],
             output: PortId(327),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22508, 22515),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(237),
-            target: TransformTarget::Callable(DeclarationId(1746)),
+            target: TransformTarget::Callable(DeclarationId(1749)),
             inputs: vec![PortId(326), PortId(327)],
             output: PortId(328),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22496, 22537),
@@ -3076,7 +3076,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
             id: NodeId(239),
             target: TransformTarget::FieldProject {
                 field_label: "nodes".to_string(),
-                field_child: Some(DeclarationId(1677)),
+                field_child: Some(DeclarationId(1680)),
             },
             inputs: vec![PortId(329)],
             output: PortId(330),
@@ -3644,7 +3644,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
 #[allow(clippy::vec_init_then_push)]
 fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
     {
-        let mut declarations = Vec::with_capacity(2261);
+        let mut declarations = Vec::with_capacity(2265);
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -16092,11 +16092,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(1496),
+                        ty: DeclarationId(1499),
                     },
                     Field {
                         label: "Cons".to_string(),
-                        ty: DeclarationId(1498),
+                        ty: DeclarationId(1501),
                     },
                 ],
             },
@@ -16129,7 +16129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1466),
+                output: DeclarationId(1469),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)),
             },
             type_params: vec![DeclarationId(607)],
@@ -16160,8 +16160,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(608),
             name: Some("cons".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(609), DeclarationId(1467)],
-                output: DeclarationId(1468),
+                inputs: vec![DeclarationId(609), DeclarationId(1470)],
+                output: DeclarationId(1471),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)),
             },
             type_params: vec![DeclarationId(609)],
@@ -16193,7 +16193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("singleton".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(611)],
-                output: DeclarationId(1469),
+                output: DeclarationId(1472),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)),
             },
             type_params: vec![DeclarationId(611)],
@@ -16224,7 +16224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(612),
             name: Some("fold".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1470), DeclarationId(614), DeclarationId(1471)],
+                inputs: vec![DeclarationId(1473), DeclarationId(614), DeclarationId(1474)],
                 output: DeclarationId(614),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)),
             },
@@ -16270,7 +16270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(615),
             name: Some("fold_right".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1472), DeclarationId(617), DeclarationId(1473)],
+                inputs: vec![DeclarationId(1475), DeclarationId(617), DeclarationId(1476)],
                 output: DeclarationId(617),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)),
             },
@@ -16316,8 +16316,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(618),
             name: Some("concat".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1474), DeclarationId(1475)],
-                output: DeclarationId(1476),
+                inputs: vec![DeclarationId(1477), DeclarationId(1478)],
+                output: DeclarationId(1479),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)),
             },
             type_params: vec![DeclarationId(619)],
@@ -16348,8 +16348,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(620),
             name: Some("map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1477), DeclarationId(1478)],
-                output: DeclarationId(1479),
+                inputs: vec![DeclarationId(1480), DeclarationId(1481)],
+                output: DeclarationId(1482),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)),
             },
             type_params: vec![DeclarationId(621), DeclarationId(622)],
@@ -16394,8 +16394,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(623),
             name: Some("filter".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1480), DeclarationId(1481)],
-                output: DeclarationId(1482),
+                inputs: vec![DeclarationId(1483), DeclarationId(1484)],
+                output: DeclarationId(1485),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)),
             },
             type_params: vec![DeclarationId(624)],
@@ -16426,8 +16426,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(625),
             name: Some("flat_map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1483), DeclarationId(1485)],
-                output: DeclarationId(1486),
+                inputs: vec![DeclarationId(1486), DeclarationId(1488)],
+                output: DeclarationId(1489),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)),
             },
             type_params: vec![DeclarationId(626), DeclarationId(627)],
@@ -16472,7 +16472,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(628),
             name: Some("length".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1487)],
+                inputs: vec![DeclarationId(1490)],
                 output: DeclarationId(81),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)),
             },
@@ -16504,7 +16504,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(630),
             name: Some("is_empty".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1488)],
+                inputs: vec![DeclarationId(1491)],
                 output: DeclarationId(99),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)),
             },
@@ -16575,8 +16575,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(634),
             name: Some("enumerate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1489)],
-                output: DeclarationId(1491),
+                inputs: vec![DeclarationId(1492)],
+                output: DeclarationId(1494),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)),
             },
             type_params: vec![DeclarationId(635)],
@@ -16607,8 +16607,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(636),
             name: Some("enumerate_helper".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1492), DeclarationId(81)],
-                output: DeclarationId(1494),
+                inputs: vec![DeclarationId(1495), DeclarationId(81)],
+                output: DeclarationId(1497),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)),
             },
             type_params: vec![DeclarationId(637)],
@@ -16639,7 +16639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(638),
             name: Some("contains".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1495), DeclarationId(639)],
+                inputs: vec![DeclarationId(1498), DeclarationId(639)],
                 output: DeclarationId(99),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)),
             },
@@ -16734,7 +16734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1499),
+                        ty: DeclarationId(1502),
                     },
                 ],
             },
@@ -16777,7 +16777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1500),
+                        ty: DeclarationId(1503),
                     },
                 ],
             },
@@ -16812,11 +16812,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LiteralToken".to_string(),
-                        ty: DeclarationId(1515),
+                        ty: DeclarationId(1518),
                     },
                     Field {
                         label: "ParamToken".to_string(),
-                        ty: DeclarationId(1516),
+                        ty: DeclarationId(1519),
                     },
                 ],
             },
@@ -16836,7 +16836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1517),
+                    ty: DeclarationId(1520),
                 }],
             },
             type_params: vec![],
@@ -16856,11 +16856,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ParsedSegmentTokens".to_string(),
-                        ty: DeclarationId(1519),
+                        ty: DeclarationId(1522),
                     },
                     Field {
                         label: "MalformedPathSegment".to_string(),
-                        ty: DeclarationId(1520),
+                        ty: DeclarationId(1523),
                     },
                 ],
             },
@@ -16881,11 +16881,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ParsedPathTemplate".to_string(),
-                        ty: DeclarationId(1521),
+                        ty: DeclarationId(1524),
                     },
                     Field {
                         label: "MalformedPathTemplate".to_string(),
-                        ty: DeclarationId(1522),
+                        ty: DeclarationId(1525),
                     },
                 ],
             },
@@ -16940,7 +16940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("last_path_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(649)],
-                output: DeclarationId(1501),
+                output: DeclarationId(1504),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)),
             },
             type_params: vec![],
@@ -16960,15 +16960,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ReadEffect".to_string(),
-                        ty: DeclarationId(1523),
+                        ty: DeclarationId(1526),
                     },
                     Field {
                         label: "UpsertEffect".to_string(),
-                        ty: DeclarationId(1524),
+                        ty: DeclarationId(1527),
                     },
                     Field {
                         label: "DeleteEffect".to_string(),
-                        ty: DeclarationId(1525),
+                        ty: DeclarationId(1528),
                     },
                 ],
             },
@@ -16989,11 +16989,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CreateEffect".to_string(),
-                        ty: DeclarationId(1526),
+                        ty: DeclarationId(1529),
                     },
                     Field {
                         label: "AppendEffect".to_string(),
-                        ty: DeclarationId(1527),
+                        ty: DeclarationId(1530),
                     },
                 ],
             },
@@ -17014,11 +17014,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IsIdempotent".to_string(),
-                        ty: DeclarationId(1528),
+                        ty: DeclarationId(1531),
                     },
                     Field {
                         label: "IsBreaking".to_string(),
-                        ty: DeclarationId(1529),
+                        ty: DeclarationId(1532),
                     },
                 ],
             },
@@ -17039,11 +17039,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PostAlways".to_string(),
-                        ty: DeclarationId(1530),
+                        ty: DeclarationId(1533),
                     },
                     Field {
                         label: "KeylessFallback".to_string(),
-                        ty: DeclarationId(1531),
+                        ty: DeclarationId(1534),
                     },
                 ],
             },
@@ -17064,15 +17064,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PathParam".to_string(),
-                        ty: DeclarationId(1532),
+                        ty: DeclarationId(1535),
                     },
                     Field {
                         label: "InputField".to_string(),
-                        ty: DeclarationId(1533),
+                        ty: DeclarationId(1536),
                     },
                     Field {
                         label: "CompositeKey".to_string(),
-                        ty: DeclarationId(1535),
+                        ty: DeclarationId(1538),
                     },
                 ],
             },
@@ -17093,15 +17093,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LatticeEffect".to_string(),
-                        ty: DeclarationId(1536),
+                        ty: DeclarationId(1539),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1537),
+                        ty: DeclarationId(1540),
                     },
                     Field {
                         label: "NonIdempotent".to_string(),
-                        ty: DeclarationId(1538),
+                        ty: DeclarationId(1541),
                     },
                 ],
             },
@@ -17183,15 +17183,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DerivedEffect".to_string(),
-                        ty: DeclarationId(1539),
+                        ty: DeclarationId(1542),
                     },
                     Field {
                         label: "UnknownHttpMethodInput".to_string(),
-                        ty: DeclarationId(1540),
+                        ty: DeclarationId(1543),
                     },
                     Field {
                         label: "MalformedPathInput".to_string(),
-                        ty: DeclarationId(1541),
+                        ty: DeclarationId(1544),
                     },
                 ],
             },
@@ -17212,11 +17212,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IdempotentComposition".to_string(),
-                        ty: DeclarationId(1542),
+                        ty: DeclarationId(1545),
                     },
                     Field {
                         label: "BrokenBy".to_string(),
-                        ty: DeclarationId(1544),
+                        ty: DeclarationId(1547),
                     },
                 ],
             },
@@ -17253,7 +17253,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(1502),
+                output: DeclarationId(1505),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20944, 20966)),
             },
             type_params: vec![],
@@ -17270,8 +17270,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(668),
             name: Some("indexed_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1503)],
-                output: DeclarationId(1505),
+                inputs: vec![DeclarationId(1506)],
+                output: DeclarationId(1508),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21060, 21153)),
             },
             type_params: vec![],
@@ -17288,8 +17288,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(669),
             name: Some("first_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1506)],
-                output: DeclarationId(1508),
+                inputs: vec![DeclarationId(1509)],
+                output: DeclarationId(1511),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21240, 21423)),
             },
             type_params: vec![],
@@ -17306,7 +17306,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(670),
             name: Some("compose_effects".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1509)],
+                inputs: vec![DeclarationId(1512)],
                 output: DeclarationId(665),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)),
             },
@@ -17371,19 +17371,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LinearEffect".to_string(),
-                        ty: DeclarationId(1546),
+                        ty: DeclarationId(1549),
                     },
                     Field {
                         label: "BranchEffect".to_string(),
-                        ty: DeclarationId(1548),
+                        ty: DeclarationId(1551),
                     },
                     Field {
                         label: "LoopEffect".to_string(),
-                        ty: DeclarationId(1549),
+                        ty: DeclarationId(1552),
                     },
                     Field {
                         label: "ParallelEffect".to_string(),
-                        ty: DeclarationId(1551),
+                        ty: DeclarationId(1554),
                     },
                 ],
             },
@@ -17433,11 +17433,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WorkflowCompositionVerdict".to_string(),
-                        ty: DeclarationId(1552),
+                        ty: DeclarationId(1555),
                     },
                     Field {
                         label: "IdempotencyUnsupported".to_string(),
-                        ty: DeclarationId(1553),
+                        ty: DeclarationId(1556),
                     },
                 ],
             },
@@ -17476,23 +17476,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoWorkflowProjection".to_string(),
-                        ty: DeclarationId(1554),
+                        ty: DeclarationId(1557),
                     },
                     Field {
                         label: "NotParallelEffectRoot".to_string(),
-                        ty: DeclarationId(1555),
+                        ty: DeclarationId(1558),
                     },
                     Field {
                         label: "NonLinearParallelBranch".to_string(),
-                        ty: DeclarationId(1556),
+                        ty: DeclarationId(1559),
                     },
                     Field {
                         label: "PairwiseNonCommute".to_string(),
-                        ty: DeclarationId(1557),
+                        ty: DeclarationId(1560),
                     },
                     Field {
                         label: "LensSurfacePending".to_string(),
-                        ty: DeclarationId(1558),
+                        ty: DeclarationId(1561),
                     },
                 ],
             },
@@ -17542,11 +17542,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ParallelCompositionVerdict".to_string(),
-                        ty: DeclarationId(1559),
+                        ty: DeclarationId(1562),
                     },
                     Field {
                         label: "ParallelismUnsupported".to_string(),
-                        ty: DeclarationId(1560),
+                        ty: DeclarationId(1563),
                     },
                 ],
             },
@@ -17601,7 +17601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("parse_http_method".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(1510),
+                output: DeclarationId(1513),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29707, 30005)),
             },
             type_params: vec![],
@@ -17636,7 +17636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(684),
             name: Some("upsert_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1511), DeclarationId(167)],
+                inputs: vec![DeclarationId(1514), DeclarationId(167)],
                 output: DeclarationId(657),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)),
             },
@@ -17654,7 +17654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(685),
             name: Some("delete_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1512), DeclarationId(167)],
+                inputs: vec![DeclarationId(1515), DeclarationId(167)],
                 output: DeclarationId(657),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)),
             },
@@ -17711,15 +17711,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Agrees".to_string(),
-                        ty: DeclarationId(1561),
+                        ty: DeclarationId(1564),
                     },
                     Field {
                         label: "Disagrees".to_string(),
-                        ty: DeclarationId(1562),
+                        ty: DeclarationId(1565),
                     },
                     Field {
                         label: "DerivationUnknown".to_string(),
-                        ty: DeclarationId(1563),
+                        ty: DeclarationId(1566),
                     },
                 ],
             },
@@ -17740,11 +17740,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ModifierNotDeclared".to_string(),
-                        ty: DeclarationId(1564),
+                        ty: DeclarationId(1567),
                     },
                     Field {
                         label: "ModifierDeclared".to_string(),
-                        ty: DeclarationId(1565),
+                        ty: DeclarationId(1568),
                     },
                 ],
             },
@@ -17882,8 +17882,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(695),
             name: Some("generate_idempotency_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1513)],
-                output: DeclarationId(1514),
+                inputs: vec![DeclarationId(1516)],
+                output: DeclarationId(1517),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 37296, 37566)),
             },
             type_params: vec![],
@@ -17951,15 +17951,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Uninferred".to_string(),
-                        ty: DeclarationId(1573),
+                        ty: DeclarationId(1576),
                     },
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(1574),
+                        ty: DeclarationId(1577),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(1575),
+                        ty: DeclarationId(1578),
                     },
                 ],
             },
@@ -17988,7 +17988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "produced_by".to_string(),
-                        ty: DeclarationId(1576),
+                        ty: DeclarationId(1579),
                     },
                 ],
             },
@@ -18009,15 +18009,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LitInt".to_string(),
-                        ty: DeclarationId(1577),
+                        ty: DeclarationId(1580),
                     },
                     Field {
                         label: "LitBool".to_string(),
-                        ty: DeclarationId(1578),
+                        ty: DeclarationId(1581),
                     },
                     Field {
                         label: "LitString".to_string(),
-                        ty: DeclarationId(1579),
+                        ty: DeclarationId(1582),
                     },
                 ],
             },
@@ -18038,23 +18038,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1580),
+                        ty: DeclarationId(1583),
                     },
                     Field {
                         label: "UnresolvedIdentifier".to_string(),
-                        ty: DeclarationId(1581),
+                        ty: DeclarationId(1584),
                     },
                     Field {
                         label: "ResolvedByStructure".to_string(),
-                        ty: DeclarationId(1582),
+                        ty: DeclarationId(1585),
                     },
                     Field {
                         label: "ResolvedByName".to_string(),
-                        ty: DeclarationId(1583),
+                        ty: DeclarationId(1586),
                     },
                     Field {
                         label: "TypeParam".to_string(),
-                        ty: DeclarationId(1584),
+                        ty: DeclarationId(1587),
                     },
                 ],
             },
@@ -18075,15 +18075,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OneUnit".to_string(),
-                        ty: DeclarationId(1585),
+                        ty: DeclarationId(1588),
                     },
                     Field {
                         label: "AdditionalUnit".to_string(),
-                        ty: DeclarationId(1586),
+                        ty: DeclarationId(1589),
                     },
                     Field {
                         label: "UnitCount".to_string(),
-                        ty: DeclarationId(1587),
+                        ty: DeclarationId(1590),
                     },
                 ],
             },
@@ -18104,11 +18104,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ZeroWidth".to_string(),
-                        ty: DeclarationId(1588),
+                        ty: DeclarationId(1591),
                     },
                     Field {
                         label: "PositiveWidth".to_string(),
-                        ty: DeclarationId(1589),
+                        ty: DeclarationId(1592),
                     },
                 ],
             },
@@ -18129,11 +18129,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BoundedInterval".to_string(),
-                        ty: DeclarationId(1590),
+                        ty: DeclarationId(1593),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1591),
+                        ty: DeclarationId(1594),
                     },
                 ],
             },
@@ -18188,11 +18188,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "StaticBound".to_string(),
-                        ty: DeclarationId(1593),
+                        ty: DeclarationId(1596),
                     },
                     Field {
                         label: "PlatformDependent".to_string(),
-                        ty: DeclarationId(1594),
+                        ty: DeclarationId(1597),
                     },
                 ],
             },
@@ -18213,15 +18213,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(1595),
+                        ty: DeclarationId(1598),
                     },
                     Field {
                         label: "AtMostOne".to_string(),
-                        ty: DeclarationId(1596),
+                        ty: DeclarationId(1599),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1597),
+                        ty: DeclarationId(1600),
                     },
                 ],
             },
@@ -18317,27 +18317,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1598),
+                        ty: DeclarationId(1601),
                     },
                     Field {
                         label: "Reference".to_string(),
-                        ty: DeclarationId(1599),
+                        ty: DeclarationId(1602),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(1601),
+                        ty: DeclarationId(1604),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(1603),
+                        ty: DeclarationId(1606),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(1605),
+                        ty: DeclarationId(1608),
                     },
                     Field {
                         label: "Variant".to_string(),
-                        ty: DeclarationId(1607),
+                        ty: DeclarationId(1610),
                     },
                 ],
             },
@@ -18358,15 +18358,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ValueBodyUnparsed".to_string(),
-                        ty: DeclarationId(1608),
+                        ty: DeclarationId(1611),
                     },
                     Field {
                         label: "ValueBodyStructural".to_string(),
-                        ty: DeclarationId(1610),
+                        ty: DeclarationId(1613),
                     },
                     Field {
                         label: "ValueBodyMap".to_string(),
-                        ty: DeclarationId(1612),
+                        ty: DeclarationId(1615),
                     },
                 ],
             },
@@ -18387,23 +18387,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UserDefined".to_string(),
-                        ty: DeclarationId(1613),
+                        ty: DeclarationId(1616),
                     },
                     Field {
                         label: "ExternalRealization".to_string(),
-                        ty: DeclarationId(1614),
+                        ty: DeclarationId(1617),
                     },
                     Field {
                         label: "Pending".to_string(),
-                        ty: DeclarationId(1615),
+                        ty: DeclarationId(1618),
                     },
                     Field {
                         label: "NoBody".to_string(),
-                        ty: DeclarationId(1616),
+                        ty: DeclarationId(1619),
                     },
                     Field {
                         label: "Unparsed".to_string(),
-                        ty: DeclarationId(1617),
+                        ty: DeclarationId(1620),
                     },
                 ],
             },
@@ -18424,27 +18424,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(1618),
+                        ty: DeclarationId(1621),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(1620),
+                        ty: DeclarationId(1623),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(1622),
+                        ty: DeclarationId(1625),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(1624),
+                        ty: DeclarationId(1627),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1625),
+                        ty: DeclarationId(1628),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(1627),
+                        ty: DeclarationId(1630),
                     },
                 ],
             },
@@ -18469,7 +18469,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(1628),
+                        ty: DeclarationId(1631),
                     },
                     Field {
                         label: "connective".to_string(),
@@ -18477,27 +18477,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(1629),
+                        ty: DeclarationId(1632),
                     },
                     Field {
                         label: "phantom_params".to_string(),
-                        ty: DeclarationId(1630),
+                        ty: DeclarationId(1633),
                     },
                     Field {
                         label: "meta_tag".to_string(),
-                        ty: DeclarationId(1631),
+                        ty: DeclarationId(1634),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(1632),
+                        ty: DeclarationId(1635),
                     },
                     Field {
                         label: "value_body".to_string(),
-                        ty: DeclarationId(1633),
+                        ty: DeclarationId(1636),
                     },
                     Field {
                         label: "nominal_opacity".to_string(),
-                        ty: DeclarationId(1634),
+                        ty: DeclarationId(1637),
                     },
                     Field {
                         label: "span".to_string(),
@@ -18546,7 +18546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "permitted_accessors".to_string(),
-                    ty: DeclarationId(1635),
+                    ty: DeclarationId(1638),
                 }],
             },
             type_params: vec![],
@@ -18566,19 +18566,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Add".to_string(),
-                        ty: DeclarationId(1636),
+                        ty: DeclarationId(1639),
                     },
                     Field {
                         label: "Sub".to_string(),
-                        ty: DeclarationId(1637),
+                        ty: DeclarationId(1640),
                     },
                     Field {
                         label: "Mul".to_string(),
-                        ty: DeclarationId(1638),
+                        ty: DeclarationId(1641),
                     },
                     Field {
                         label: "Div".to_string(),
-                        ty: DeclarationId(1639),
+                        ty: DeclarationId(1642),
                     },
                 ],
             },
@@ -18599,27 +18599,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(1640),
+                        ty: DeclarationId(1643),
                     },
                     Field {
                         label: "Ne".to_string(),
-                        ty: DeclarationId(1641),
+                        ty: DeclarationId(1644),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(1642),
+                        ty: DeclarationId(1645),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(1643),
+                        ty: DeclarationId(1646),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(1644),
+                        ty: DeclarationId(1647),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(1645),
+                        ty: DeclarationId(1648),
                     },
                 ],
             },
@@ -18640,11 +18640,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "And".to_string(),
-                        ty: DeclarationId(1646),
+                        ty: DeclarationId(1649),
                     },
                     Field {
                         label: "Or".to_string(),
-                        ty: DeclarationId(1647),
+                        ty: DeclarationId(1650),
                     },
                 ],
             },
@@ -18665,15 +18665,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Arithmetic".to_string(),
-                        ty: DeclarationId(1648),
+                        ty: DeclarationId(1651),
                     },
                     Field {
                         label: "Comparison".to_string(),
-                        ty: DeclarationId(1649),
+                        ty: DeclarationId(1652),
                     },
                     Field {
                         label: "Logical".to_string(),
-                        ty: DeclarationId(1650),
+                        ty: DeclarationId(1653),
                     },
                 ],
             },
@@ -18694,15 +18694,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Callable".to_string(),
-                        ty: DeclarationId(1651),
+                        ty: DeclarationId(1654),
                     },
                     Field {
                         label: "FieldProject".to_string(),
-                        ty: DeclarationId(1653),
+                        ty: DeclarationId(1656),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(1654),
+                        ty: DeclarationId(1657),
                     },
                 ],
             },
@@ -18723,11 +18723,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UnresolvedVariant".to_string(),
-                        ty: DeclarationId(1655),
+                        ty: DeclarationId(1658),
                     },
                     Field {
                         label: "ResolvedVariant".to_string(),
-                        ty: DeclarationId(1656),
+                        ty: DeclarationId(1659),
                     },
                 ],
             },
@@ -18785,7 +18785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "binding".to_string(),
-                        ty: DeclarationId(1657),
+                        ty: DeclarationId(1660),
                     },
                 ],
             },
@@ -18921,11 +18921,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "members".to_string(),
-                        ty: DeclarationId(1658),
+                        ty: DeclarationId(1661),
                     },
                     Field {
                         label: "intra_cluster_calls".to_string(),
-                        ty: DeclarationId(1659),
+                        ty: DeclarationId(1662),
                     },
                 ],
             },
@@ -18946,11 +18946,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1660),
+                        ty: DeclarationId(1663),
                     },
                     Field {
                         label: "Descent".to_string(),
-                        ty: DeclarationId(1661),
+                        ty: DeclarationId(1664),
                     },
                 ],
             },
@@ -19005,7 +19005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1662),
+                        ty: DeclarationId(1665),
                     },
                 ],
             },
@@ -19034,7 +19034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1663),
+                        ty: DeclarationId(1666),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -19062,7 +19062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserMatch".to_string(),
-                    ty: DeclarationId(1664),
+                    ty: DeclarationId(1667),
                 }],
             },
             type_params: vec![],
@@ -19090,7 +19090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(1665),
+                        ty: DeclarationId(1668),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -19102,7 +19102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1666),
+                        ty: DeclarationId(1669),
                     },
                 ],
             },
@@ -19167,7 +19167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserCallable".to_string(),
-                    ty: DeclarationId(1667),
+                    ty: DeclarationId(1670),
                 }],
             },
             type_params: vec![],
@@ -19199,7 +19199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(1668),
+                        ty: DeclarationId(1671),
                     },
                     Field {
                         label: "span".to_string(),
@@ -19207,11 +19207,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1669),
+                        ty: DeclarationId(1672),
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1670),
+                        ty: DeclarationId(1673),
                     },
                 ],
             },
@@ -19232,23 +19232,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(1671),
+                        ty: DeclarationId(1674),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(1672),
+                        ty: DeclarationId(1675),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(1673),
+                        ty: DeclarationId(1676),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(1674),
+                        ty: DeclarationId(1677),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(1675),
+                        ty: DeclarationId(1678),
                     },
                 ],
             },
@@ -19269,19 +19269,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "declarations".to_string(),
-                        ty: DeclarationId(1676),
+                        ty: DeclarationId(1679),
                     },
                     Field {
                         label: "nodes".to_string(),
-                        ty: DeclarationId(1677),
+                        ty: DeclarationId(1680),
                     },
                     Field {
                         label: "ports".to_string(),
-                        ty: DeclarationId(1678),
+                        ty: DeclarationId(1681),
                     },
                     Field {
                         label: "clusters".to_string(),
-                        ty: DeclarationId(1679),
+                        ty: DeclarationId(1682),
                     },
                 ],
             },
@@ -19321,15 +19321,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "accessor".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "realization".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                 ],
             },
@@ -19348,7 +19348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("port".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744), DeclarationId(641)],
-                output: DeclarationId(1566),
+                output: DeclarationId(1569),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     18579,
@@ -19370,7 +19370,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("node".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744), DeclarationId(640)],
-                output: DeclarationId(1567),
+                output: DeclarationId(1570),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     18637,
@@ -19392,7 +19392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("resolve_producer".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744), DeclarationId(641)],
-                output: DeclarationId(1568),
+                output: DeclarationId(1571),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     18712,
@@ -19414,7 +19414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("declaration_by_id".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744), DeclarationId(642)],
-                output: DeclarationId(1569),
+                output: DeclarationId(1572),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     19101,
@@ -19436,7 +19436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("lane2_workflow_at".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744), DeclarationId(640)],
-                output: DeclarationId(1570),
+                output: DeclarationId(1573),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     19425,
@@ -19460,15 +19460,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SingleRoot".to_string(),
-                        ty: DeclarationId(1680),
+                        ty: DeclarationId(1683),
                     },
                     Field {
                         label: "NoRoot".to_string(),
-                        ty: DeclarationId(1681),
+                        ty: DeclarationId(1684),
                     },
                     Field {
                         label: "AmbiguousRoot".to_string(),
-                        ty: DeclarationId(1683),
+                        ty: DeclarationId(1686),
                     },
                 ],
             },
@@ -19509,7 +19509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("miss_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1571),
+                output: DeclarationId(1574),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     23430,
@@ -19531,7 +19531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("hit_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(642)],
-                output: DeclarationId(1572),
+                output: DeclarationId(1575),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     23515,
@@ -19554,7 +19554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1078),
+                    ty: DeclarationId(1081),
                 }],
             },
             type_params: vec![],
@@ -19574,15 +19574,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ShrinkEffect".to_string(),
-                        ty: DeclarationId(1703),
+                        ty: DeclarationId(1706),
                     },
                     Field {
                         label: "ProjectionEffect".to_string(),
-                        ty: DeclarationId(1704),
+                        ty: DeclarationId(1707),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1705),
+                        ty: DeclarationId(1708),
                     },
                 ],
             },
@@ -19603,19 +19603,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ShapeConstant".to_string(),
-                        ty: DeclarationId(1706),
+                        ty: DeclarationId(1709),
                     },
                     Field {
                         label: "ShapeLinearScan".to_string(),
-                        ty: DeclarationId(1707),
+                        ty: DeclarationId(1710),
                     },
                     Field {
                         label: "ShapeIterateBody".to_string(),
-                        ty: DeclarationId(1708),
+                        ty: DeclarationId(1711),
                     },
                     Field {
                         label: "ShapeSortBody".to_string(),
-                        ty: DeclarationId(1709),
+                        ty: DeclarationId(1712),
                     },
                 ],
             },
@@ -19644,15 +19644,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "size_effect".to_string(),
-                        ty: DeclarationId(1710),
+                        ty: DeclarationId(1713),
                     },
                     Field {
                         label: "cost_shape".to_string(),
-                        ty: DeclarationId(1711),
+                        ty: DeclarationId(1714),
                     },
                     Field {
                         label: "callback_element_position".to_string(),
-                        ty: DeclarationId(1712),
+                        ty: DeclarationId(1715),
                     },
                 ],
             },
@@ -19692,11 +19692,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DegreeTwo".to_string(),
-                        ty: DeclarationId(1713),
+                        ty: DeclarationId(1716),
                     },
                     Field {
                         label: "DegreeSuccessor".to_string(),
-                        ty: DeclarationId(1714),
+                        ty: DeclarationId(1717),
                     },
                 ],
             },
@@ -19717,31 +19717,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ConstantCost".to_string(),
-                        ty: DeclarationId(1715),
+                        ty: DeclarationId(1718),
                     },
                     Field {
                         label: "LinearCost".to_string(),
-                        ty: DeclarationId(1716),
+                        ty: DeclarationId(1719),
                     },
                     Field {
                         label: "PolynomialCost".to_string(),
-                        ty: DeclarationId(1717),
+                        ty: DeclarationId(1720),
                     },
                     Field {
                         label: "ProductCost".to_string(),
-                        ty: DeclarationId(1719),
+                        ty: DeclarationId(1722),
                     },
                     Field {
                         label: "SumCost".to_string(),
-                        ty: DeclarationId(1721),
+                        ty: DeclarationId(1724),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(1722),
+                        ty: DeclarationId(1725),
                     },
                     Field {
                         label: "UnknownCost".to_string(),
-                        ty: DeclarationId(1723),
+                        ty: DeclarationId(1726),
                     },
                 ],
             },
@@ -19803,7 +19803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("miss_symbolic_cost_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1684),
+                output: DeclarationId(1687),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 9870, 9880)),
             },
             type_params: vec![],
@@ -19821,7 +19821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("hit_symbolic_cost_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(762)],
-                output: DeclarationId(1685),
+                output: DeclarationId(1688),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 9954, 9969)),
             },
             type_params: vec![],
@@ -19839,7 +19839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("two_terms".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(762), DeclarationId(762)],
-                output: DeclarationId(1686),
+                output: DeclarationId(1689),
                 body: ArrowBody::UserDefined(NodeId(10)),
             },
             type_params: vec![],
@@ -19856,8 +19856,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(768),
             name: Some("many_terms".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(762), DeclarationId(762), DeclarationId(1687)],
-                output: DeclarationId(1688),
+                inputs: vec![DeclarationId(762), DeclarationId(762), DeclarationId(1690)],
+                output: DeclarationId(1691),
                 body: ArrowBody::UserDefined(NodeId(12)),
             },
             type_params: vec![],
@@ -19982,7 +19982,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(775),
             name: Some("max_path".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1689)],
+                inputs: vec![DeclarationId(1692)],
                 output: DeclarationId(762),
                 body: ArrowBody::UserDefined(NodeId(45)),
             },
@@ -20054,8 +20054,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(779),
             name: Some("nsl_to_list".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1690)],
-                output: DeclarationId(1691),
+                inputs: vec![DeclarationId(1693)],
+                output: DeclarationId(1694),
                 body: ArrowBody::UserDefined(NodeId(116)),
             },
             type_params: vec![],
@@ -20072,8 +20072,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(780),
             name: Some("drop_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1692)],
-                output: DeclarationId(1693),
+                inputs: vec![DeclarationId(1695)],
+                output: DeclarationId(1696),
                 body: ArrowBody::UserDefined(NodeId(129)),
             },
             type_params: vec![],
@@ -20108,7 +20108,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(782),
             name: Some("reduce_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1694)],
+                inputs: vec![DeclarationId(1697)],
                 output: DeclarationId(762),
                 body: ArrowBody::UserDefined(NodeId(151)),
             },
@@ -20126,7 +20126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(783),
             name: Some("wrap_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1695)],
+                inputs: vec![DeclarationId(1698)],
                 output: DeclarationId(762),
                 body: ArrowBody::UserDefined(NodeId(163)),
             },
@@ -20144,7 +20144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(784),
             name: Some("reduce_product".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1696)],
+                inputs: vec![DeclarationId(1699)],
                 output: DeclarationId(762),
                 body: ArrowBody::UserDefined(NodeId(180)),
             },
@@ -20293,8 +20293,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(792),
             name: Some("filter_not_dominated_by".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1697), DeclarationId(762)],
-                output: DeclarationId(1698),
+                inputs: vec![DeclarationId(1700), DeclarationId(762)],
+                output: DeclarationId(1701),
                 body: ArrowBody::UserDefined(NodeId(228)),
             },
             type_params: vec![],
@@ -20311,8 +20311,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(793),
             name: Some("drop_dominated_step".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1699), DeclarationId(762)],
-                output: DeclarationId(1700),
+                inputs: vec![DeclarationId(1702), DeclarationId(762)],
+                output: DeclarationId(1703),
                 body: ArrowBody::UserDefined(NodeId(235)),
             },
             type_params: vec![],
@@ -20329,8 +20329,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(794),
             name: Some("drop_dominated".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1701)],
-                output: DeclarationId(1702),
+                inputs: vec![DeclarationId(1704)],
+                output: DeclarationId(1705),
                 body: ArrowBody::UserDefined(NodeId(238)),
             },
             type_params: vec![],
@@ -20350,10 +20350,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 inputs: vec![
                     DeclarationId(118),
                     DeclarationId(197),
-                    DeclarationId(1747),
+                    DeclarationId(1750),
                     DeclarationId(81),
-                    DeclarationId(1748),
-                    DeclarationId(1749),
+                    DeclarationId(1751),
+                    DeclarationId(1752),
                 ],
                 output: DeclarationId(803),
                 body: ArrowBody::Unparsed(SourceSpan::new(
@@ -20379,12 +20379,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1024),
+                    value: DeclarationId(1027),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1750)),
+            meta_tag: Some(DeclarationId(1753)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![])),
@@ -20399,11 +20399,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UserMessage".to_string(),
-                        ty: DeclarationId(1752),
+                        ty: DeclarationId(1755),
                     },
                     Field {
                         label: "AssistantMessage".to_string(),
-                        ty: DeclarationId(1754),
+                        ty: DeclarationId(1757),
                     },
                 ],
             },
@@ -20424,11 +20424,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UserTextBlock".to_string(),
-                        ty: DeclarationId(1755),
+                        ty: DeclarationId(1758),
                     },
                     Field {
                         label: "UserToolResultBlock".to_string(),
-                        ty: DeclarationId(1757),
+                        ty: DeclarationId(1760),
                     },
                 ],
             },
@@ -20449,11 +20449,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "AssistantTextBlock".to_string(),
-                        ty: DeclarationId(1758),
+                        ty: DeclarationId(1761),
                     },
                     Field {
                         label: "AssistantToolUseBlock".to_string(),
-                        ty: DeclarationId(1759),
+                        ty: DeclarationId(1762),
                     },
                 ],
             },
@@ -20474,31 +20474,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EndTurn".to_string(),
-                        ty: DeclarationId(1760),
+                        ty: DeclarationId(1763),
                     },
                     Field {
                         label: "MaxTokens".to_string(),
-                        ty: DeclarationId(1761),
+                        ty: DeclarationId(1764),
                     },
                     Field {
                         label: "StopSequence".to_string(),
-                        ty: DeclarationId(1762),
+                        ty: DeclarationId(1765),
                     },
                     Field {
                         label: "ToolUse".to_string(),
-                        ty: DeclarationId(1763),
+                        ty: DeclarationId(1766),
                     },
                     Field {
                         label: "PauseTurn".to_string(),
-                        ty: DeclarationId(1764),
+                        ty: DeclarationId(1767),
                     },
                     Field {
                         label: "Refusal".to_string(),
-                        ty: DeclarationId(1765),
+                        ty: DeclarationId(1768),
                     },
                     Field {
                         label: "ModelContextWindowExceeded".to_string(),
-                        ty: DeclarationId(1766),
+                        ty: DeclarationId(1769),
                     },
                 ],
             },
@@ -20581,7 +20581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(1767),
+                        ty: DeclarationId(1770),
                     },
                     Field {
                         label: "model".to_string(),
@@ -20593,7 +20593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "stop_sequence".to_string(),
-                        ty: DeclarationId(1768),
+                        ty: DeclarationId(1771),
                     },
                     Field {
                         label: "usage".to_string(),
@@ -20618,23 +20618,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ToNearestEven".to_string(),
-                        ty: DeclarationId(1769),
+                        ty: DeclarationId(1772),
                     },
                     Field {
                         label: "ToZero".to_string(),
-                        ty: DeclarationId(1770),
+                        ty: DeclarationId(1773),
                     },
                     Field {
                         label: "ToPositiveInfinity".to_string(),
-                        ty: DeclarationId(1771),
+                        ty: DeclarationId(1774),
                     },
                     Field {
                         label: "ToNegativeInfinity".to_string(),
-                        ty: DeclarationId(1772),
+                        ty: DeclarationId(1775),
                     },
                     Field {
                         label: "ToAwayFromZero".to_string(),
-                        ty: DeclarationId(1773),
+                        ty: DeclarationId(1776),
                     },
                 ],
             },
@@ -20646,7 +20646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 757, 868),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1185, 1296),
         });
         declarations.push(Declaration {
             id: DeclarationId(805),
@@ -20655,15 +20655,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1774),
+                        ty: DeclarationId(1777),
                     },
                     Field {
                         label: "BinaryPrecision".to_string(),
-                        ty: DeclarationId(1775),
+                        ty: DeclarationId(1778),
                     },
                     Field {
                         label: "DecimalPrecision".to_string(),
-                        ty: DeclarationId(1776),
+                        ty: DeclarationId(1779),
                     },
                 ],
             },
@@ -20675,7 +20675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1131, 1316),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1559, 1744),
         });
         declarations.push(Declaration {
             id: DeclarationId(806),
@@ -20684,15 +20684,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoNaN".to_string(),
-                        ty: DeclarationId(1777),
+                        ty: DeclarationId(1780),
                     },
                     Field {
                         label: "QuietNaN".to_string(),
-                        ty: DeclarationId(1778),
+                        ty: DeclarationId(1781),
                     },
                     Field {
                         label: "QuietAndSignalingNaN".to_string(),
-                        ty: DeclarationId(1779),
+                        ty: DeclarationId(1782),
                     },
                 ],
             },
@@ -20704,7 +20704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1501, 1557),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1929, 1985),
         });
         declarations.push(Declaration {
             id: DeclarationId(807),
@@ -20713,11 +20713,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoInfinity".to_string(),
-                        ty: DeclarationId(1780),
+                        ty: DeclarationId(1783),
                     },
                     Field {
                         label: "SignedInfinity".to_string(),
-                        ty: DeclarationId(1781),
+                        ty: DeclarationId(1784),
                     },
                 ],
             },
@@ -20729,7 +20729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1747, 1796),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2175, 2224),
         });
         declarations.push(Declaration {
             id: DeclarationId(808),
@@ -20738,11 +20738,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoSignedZero".to_string(),
-                        ty: DeclarationId(1782),
+                        ty: DeclarationId(1785),
                     },
                     Field {
                         label: "SignedZero".to_string(),
-                        ty: DeclarationId(1783),
+                        ty: DeclarationId(1786),
                     },
                 ],
             },
@@ -20754,7 +20754,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1989, 2038),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2417, 2466),
         });
         declarations.push(Declaration {
             id: DeclarationId(809),
@@ -20763,15 +20763,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoSubnormals".to_string(),
-                        ty: DeclarationId(1784),
+                        ty: DeclarationId(1787),
                     },
                     Field {
                         label: "GradualUnderflow".to_string(),
-                        ty: DeclarationId(1785),
+                        ty: DeclarationId(1788),
                     },
                     Field {
                         label: "FlushToZero".to_string(),
-                        ty: DeclarationId(1786),
+                        ty: DeclarationId(1789),
                     },
                 ],
             },
@@ -20783,10 +20783,90 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2235, 2303),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2663, 2731),
         });
         declarations.push(Declaration {
             id: DeclarationId(810),
+            name: Some("SpecialValues".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "nan".to_string(),
+                        ty: DeclarationId(806),
+                    },
+                    Field {
+                        label: "infinity".to_string(),
+                        ty: DeclarationId(807),
+                    },
+                    Field {
+                        label: "signed_zero".to_string(),
+                        ty: DeclarationId(808),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3007, 3105),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(811),
+            name: Some("ApproximateField".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "base".to_string(),
+                        ty: DeclarationId(1790),
+                    },
+                    Field {
+                        label: "rounding".to_string(),
+                        ty: DeclarationId(804),
+                    },
+                    Field {
+                        label: "precision".to_string(),
+                        ty: DeclarationId(805),
+                    },
+                    Field {
+                        label: "special_values".to_string(),
+                        ty: DeclarationId(810),
+                    },
+                    Field {
+                        label: "subnormal_policy".to_string(),
+                        ty: DeclarationId(809),
+                    },
+                ],
+            },
+            type_params: vec![DeclarationId(812)],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3341, 3502),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(812),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("F".to_string())),
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3341, 3502),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(813),
             name: Some("BinShim".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -20800,7 +20880,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "entry".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                 ],
             },
@@ -20815,17 +20895,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bin_shim.dag", 801, 894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(811),
+            id: DeclarationId(814),
             name: Some("BridgeStatus".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Retired".to_string(),
-                        ty: DeclarationId(1787),
+                        ty: DeclarationId(1791),
                     },
                     Field {
                         label: "Open".to_string(),
-                        ty: DeclarationId(1788),
+                        ty: DeclarationId(1792),
                     },
                 ],
             },
@@ -20840,12 +20920,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4292, 4330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(812),
+            id: DeclarationId(815),
             name: Some("BridgeLedgerRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1078),
+                    ty: DeclarationId(1081),
                 }],
             },
             type_params: vec![],
@@ -20859,7 +20939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 5294, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(813),
+            id: DeclarationId(816),
             name: Some("BridgeLedgerRow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -20873,7 +20953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "status".to_string(),
-                        ty: DeclarationId(811),
+                        ty: DeclarationId(814),
                     },
                     Field {
                         label: "authority".to_string(),
@@ -20891,47 +20971,47 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 5984, 6094),
         });
-        declarations.push(Declaration { id: DeclarationId(814), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(813) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1789)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_source_span_file_participation_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R3".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1788), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("ROADMAP.md#lens-fold-file-path-semantics".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_mark_bootstrap_secret_nominal_opacity_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1787), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #937".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_dispatch_pr1183_slice_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1787), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/canonical_lens_bridge_ratchet_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1788), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r2-pb-canonical-lens-bridge-disposition.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1788), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #1171".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1788), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/r3-structure.md:83".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6558, 8315) });
+        declarations.push(Declaration { id: DeclarationId(817), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(816) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1793)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_source_span_file_participation_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R3".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1792), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("ROADMAP.md#lens-fold-file-path-semantics".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_mark_bootstrap_secret_nominal_opacity_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1791), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #937".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_dispatch_pr1183_slice_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1791), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/canonical_lens_bridge_ratchet_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1792), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r2-pb-canonical-lens-bridge-disposition.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1792), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #1171".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1792), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/r3-structure.md:83".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6558, 8315) });
         declarations.push(Declaration {
-            id: DeclarationId(815),
+            id: DeclarationId(818),
             name: Some("CleanEmissionContract".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "expression_wrapping".to_string(),
-                        ty: DeclarationId(817),
+                        ty: DeclarationId(820),
                     },
                     Field {
                         label: "pattern_bindings".to_string(),
-                        ty: DeclarationId(818),
+                        ty: DeclarationId(821),
                     },
                     Field {
                         label: "variant_payload_field_access".to_string(),
-                        ty: DeclarationId(819),
+                        ty: DeclarationId(822),
                     },
                     Field {
                         label: "imports".to_string(),
-                        ty: DeclarationId(820),
+                        ty: DeclarationId(823),
                     },
                     Field {
                         label: "block_return".to_string(),
-                        ty: DeclarationId(821),
+                        ty: DeclarationId(824),
                     },
                     Field {
                         label: "variable_bindings".to_string(),
-                        ty: DeclarationId(822),
+                        ty: DeclarationId(825),
                     },
                     Field {
                         label: "match_arm_body".to_string(),
-                        ty: DeclarationId(823),
+                        ty: DeclarationId(826),
                     },
                     Field {
                         label: "correction_style".to_string(),
-                        ty: DeclarationId(824),
+                        ty: DeclarationId(827),
                     },
                     Field {
                         label: "post_emit_verifier".to_string(),
-                        ty: DeclarationId(825),
+                        ty: DeclarationId(828),
                     },
                 ],
             },
@@ -20946,17 +21026,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 562, 944),
         });
         declarations.push(Declaration {
-            id: DeclarationId(816),
+            id: DeclarationId(819),
             name: Some("TargetCleanEmissionBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(925),
+                        ty: DeclarationId(928),
                     },
                     Field {
                         label: "clean_emission".to_string(),
-                        ty: DeclarationId(815),
+                        ty: DeclarationId(818),
                     },
                 ],
             },
@@ -20971,21 +21051,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 1748, 1848),
         });
         declarations.push(Declaration {
-            id: DeclarationId(817),
+            id: DeclarationId(820),
             name: Some("ExpressionWrappingRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "WrapEverything".to_string(),
-                        ty: DeclarationId(1790),
+                        ty: DeclarationId(1794),
                     },
                     Field {
                         label: "WrapOnlyInOperandPosition".to_string(),
-                        ty: DeclarationId(1791),
+                        ty: DeclarationId(1795),
                     },
                     Field {
                         label: "NoWrapping".to_string(),
-                        ty: DeclarationId(1792),
+                        ty: DeclarationId(1796),
                     },
                 ],
             },
@@ -21000,25 +21080,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2192, 2283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(818),
+            id: DeclarationId(821),
             name: Some("PatternBindingRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "EmitBindingAlways".to_string(),
-                        ty: DeclarationId(1793),
+                        ty: DeclarationId(1797),
                     },
                     Field {
                         label: "EmitUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1794),
+                        ty: DeclarationId(1798),
                     },
                     Field {
                         label: "EmitPrefixedUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1795),
+                        ty: DeclarationId(1799),
                     },
                     Field {
                         label: "NotApplicablePatternBinding".to_string(),
-                        ty: DeclarationId(1796),
+                        ty: DeclarationId(1800),
                     },
                 ],
             },
@@ -21033,17 +21113,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2520, 2663),
         });
         declarations.push(Declaration {
-            id: DeclarationId(819),
+            id: DeclarationId(822),
             name: Some("VariantPayloadFieldAccessRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AccessFromPayloadBinding".to_string(),
-                        ty: DeclarationId(1797),
+                        ty: DeclarationId(1801),
                     },
                     Field {
                         label: "OverrideNamedFieldsAtBindingSite".to_string(),
-                        ty: DeclarationId(1798),
+                        ty: DeclarationId(1802),
                     },
                 ],
             },
@@ -21058,21 +21138,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3330, 3430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(820),
+            id: DeclarationId(823),
             name: Some("ImportRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ImportEverythingDeclared".to_string(),
-                        ty: DeclarationId(1799),
+                        ty: DeclarationId(1803),
                     },
                     Field {
                         label: "IncludeOnlyReferenced".to_string(),
-                        ty: DeclarationId(1800),
+                        ty: DeclarationId(1804),
                     },
                     Field {
                         label: "ImportPerUsageSite".to_string(),
-                        ty: DeclarationId(1801),
+                        ty: DeclarationId(1805),
                     },
                 ],
             },
@@ -21087,21 +21167,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3544, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(821),
+            id: DeclarationId(824),
             name: Some("BlockReturnRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "WrapReturnValue".to_string(),
-                        ty: DeclarationId(1802),
+                        ty: DeclarationId(1806),
                     },
                     Field {
                         label: "NoWrappingOnTerminalExpression".to_string(),
-                        ty: DeclarationId(1803),
+                        ty: DeclarationId(1807),
                     },
                     Field {
                         label: "ExplicitReturnKeyword".to_string(),
-                        ty: DeclarationId(1804),
+                        ty: DeclarationId(1808),
                     },
                 ],
             },
@@ -21116,21 +21196,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3756, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(822),
+            id: DeclarationId(825),
             name: Some("VariableBindingRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "EmitLetBindingAlways".to_string(),
-                        ty: DeclarationId(1805),
+                        ty: DeclarationId(1809),
                     },
                     Field {
                         label: "EmitLetUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1806),
+                        ty: DeclarationId(1810),
                     },
                     Field {
                         label: "OmitLetBinding".to_string(),
-                        ty: DeclarationId(1807),
+                        ty: DeclarationId(1811),
                     },
                 ],
             },
@@ -21145,21 +21225,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3995, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(823),
+            id: DeclarationId(826),
             name: Some("MatchArmBodyRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "WrapBody".to_string(),
-                        ty: DeclarationId(1808),
+                        ty: DeclarationId(1812),
                     },
                     Field {
                         label: "NoWrappingOnNonComplexBody".to_string(),
-                        ty: DeclarationId(1809),
+                        ty: DeclarationId(1813),
                     },
                     Field {
                         label: "NotApplicableMatchArmBody".to_string(),
-                        ty: DeclarationId(1810),
+                        ty: DeclarationId(1814),
                     },
                 ],
             },
@@ -21174,7 +21254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4328, 4423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(824),
+            id: DeclarationId(827),
             name: Some("CorrectionStyle".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -21207,7 +21287,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4736, 4854),
         });
         declarations.push(Declaration {
-            id: DeclarationId(825),
+            id: DeclarationId(828),
             name: Some("PostEmitVerifier".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -21217,7 +21297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(1811),
+                        ty: DeclarationId(1815),
                     },
                     Field {
                         label: "syntax_only".to_string(),
@@ -21229,7 +21309,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "output_policy".to_string(),
-                        ty: DeclarationId(826),
+                        ty: DeclarationId(829),
                     },
                 ],
             },
@@ -21244,25 +21324,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5270, 5418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(826),
+            id: DeclarationId(829),
             name: Some("VerifierOutputPolicy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IgnoreVerifierOutput".to_string(),
-                        ty: DeclarationId(1812),
+                        ty: DeclarationId(1816),
                     },
                     Field {
                         label: "RequireEmptyStdout".to_string(),
-                        ty: DeclarationId(1813),
+                        ty: DeclarationId(1817),
                     },
                     Field {
                         label: "RequireEmptyStderr".to_string(),
-                        ty: DeclarationId(1814),
+                        ty: DeclarationId(1818),
                     },
                     Field {
                         label: "RequireEmptyStdoutAndStderr".to_string(),
-                        ty: DeclarationId(1815),
+                        ty: DeclarationId(1819),
                     },
                 ],
             },
@@ -21277,41 +21357,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5663, 5791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(827),
+            id: DeclarationId(830),
             name: Some("SizeBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CollectionSize".to_string(),
-                        ty: DeclarationId(1820),
+                        ty: DeclarationId(1824),
                     },
                     Field {
                         label: "ParserStreamSize".to_string(),
-                        ty: DeclarationId(1821),
+                        ty: DeclarationId(1825),
                     },
                     Field {
                         label: "WorklistDrainSize".to_string(),
-                        ty: DeclarationId(1822),
+                        ty: DeclarationId(1826),
                     },
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(1823),
+                        ty: DeclarationId(1827),
                     },
                     Field {
                         label: "ArithmeticParam".to_string(),
-                        ty: DeclarationId(1824),
+                        ty: DeclarationId(1828),
                     },
                     Field {
                         label: "ExplicitCountZero".to_string(),
-                        ty: DeclarationId(1825),
+                        ty: DeclarationId(1829),
                     },
                     Field {
                         label: "ExplicitCountPositive".to_string(),
-                        ty: DeclarationId(1826),
+                        ty: DeclarationId(1830),
                     },
                     Field {
                         label: "Forever".to_string(),
-                        ty: DeclarationId(1827),
+                        ty: DeclarationId(1831),
                     },
                 ],
             },
@@ -21326,11 +21406,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1337, 1633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(828),
+            id: DeclarationId(831),
             name: Some("tree_size_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(827),
+                output: DeclarationId(830),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     1682,
@@ -21348,10 +21428,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1635, 1713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(829),
+            id: DeclarationId(832),
             name: Some("positive_descent_count".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1033)],
+                inputs: vec![DeclarationId(1036)],
                 output: DeclarationId(81),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
@@ -21370,41 +21450,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1715, 1893),
         });
         declarations.push(Declaration {
-            id: DeclarationId(830),
+            id: DeclarationId(833),
             name: Some("CallPattern".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ChildAccessorCall".to_string(),
-                        ty: DeclarationId(1828),
+                        ty: DeclarationId(1832),
                     },
                     Field {
                         label: "CollectionShrinkCall".to_string(),
-                        ty: DeclarationId(1829),
+                        ty: DeclarationId(1833),
                     },
                     Field {
                         label: "ArithmeticSubtractCall".to_string(),
-                        ty: DeclarationId(1830),
+                        ty: DeclarationId(1834),
                     },
                     Field {
                         label: "ArithmeticDivideCall".to_string(),
-                        ty: DeclarationId(1831),
+                        ty: DeclarationId(1835),
                     },
                     Field {
                         label: "ParserAdvanceCall".to_string(),
-                        ty: DeclarationId(1832),
+                        ty: DeclarationId(1836),
                     },
                     Field {
                         label: "WorklistDrainCall".to_string(),
-                        ty: DeclarationId(1833),
+                        ty: DeclarationId(1837),
                     },
                     Field {
                         label: "FoldBodyCall".to_string(),
-                        ty: DeclarationId(1834),
+                        ty: DeclarationId(1838),
                     },
                     Field {
                         label: "SameArgumentCall".to_string(),
-                        ty: DeclarationId(1835),
+                        ty: DeclarationId(1839),
                     },
                 ],
             },
@@ -21419,21 +21499,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2144, 2591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(831),
+            id: DeclarationId(834),
             name: Some("ShrinkFactor".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UnitShrink".to_string(),
-                        ty: DeclarationId(1836),
+                        ty: DeclarationId(1840),
                     },
                     Field {
                         label: "ConstantShrink".to_string(),
-                        ty: DeclarationId(1837),
+                        ty: DeclarationId(1841),
                     },
                     Field {
                         label: "ProportionalShrink".to_string(),
-                        ty: DeclarationId(1838),
+                        ty: DeclarationId(1842),
                     },
                 ],
             },
@@ -21448,21 +21528,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2781, 2921),
         });
         declarations.push(Declaration {
-            id: DeclarationId(832),
+            id: DeclarationId(835),
             name: Some("IterationPrimitive".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Fold".to_string(),
-                        ty: DeclarationId(1839),
+                        ty: DeclarationId(1843),
                     },
                     Field {
                         label: "Descend".to_string(),
-                        ty: DeclarationId(1840),
+                        ty: DeclarationId(1844),
                     },
                     Field {
                         label: "Repeat".to_string(),
-                        ty: DeclarationId(1841),
+                        ty: DeclarationId(1845),
                     },
                 ],
             },
@@ -21477,25 +21557,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3083, 3138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(833),
+            id: DeclarationId(836),
             name: Some("LoweringTarget".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "primitive".to_string(),
-                        ty: DeclarationId(832),
+                        ty: DeclarationId(835),
                     },
                     Field {
                         label: "bound".to_string(),
-                        ty: DeclarationId(827),
+                        ty: DeclarationId(830),
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(1025),
+                        ty: DeclarationId(1028),
                     },
                     Field {
                         label: "factor".to_string(),
-                        ty: DeclarationId(1842),
+                        ty: DeclarationId(1846),
                     },
                 ],
             },
@@ -21510,11 +21590,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3330, 3456),
         });
         declarations.push(Declaration {
-            id: DeclarationId(834),
+            id: DeclarationId(837),
             name: Some("lower_call_pattern".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(830)],
-                output: DeclarationId(833),
+                inputs: vec![DeclarationId(833)],
+                output: DeclarationId(836),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     3767,
@@ -21532,11 +21612,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3705, 5318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(835),
+            id: DeclarationId(838),
             name: Some("size_bound_param".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(827)],
-                output: DeclarationId(1816),
+                inputs: vec![DeclarationId(830)],
+                output: DeclarationId(1820),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     5369,
@@ -21554,10 +21634,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5320, 5794),
         });
         declarations.push(Declaration {
-            id: DeclarationId(836),
+            id: DeclarationId(839),
             name: Some("is_constant_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(827)],
+                inputs: vec![DeclarationId(830)],
                 output: DeclarationId(99),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
@@ -21576,7 +21656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5796, 6014),
         });
         declarations.push(Declaration {
-            id: DeclarationId(837),
+            id: DeclarationId(840),
             name: Some("forever_iteration_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
@@ -21598,11 +21678,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6095, 6154),
         });
         declarations.push(Declaration {
-            id: DeclarationId(838),
+            id: DeclarationId(841),
             name: Some("constant_bound_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(827)],
-                output: DeclarationId(1817),
+                inputs: vec![DeclarationId(830)],
+                output: DeclarationId(1821),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     6297,
@@ -21620,21 +21700,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6247, 6569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(839),
+            id: DeclarationId(842),
             name: Some("IterationDimension".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TreeDescent".to_string(),
-                        ty: DeclarationId(1843),
+                        ty: DeclarationId(1847),
                     },
                     Field {
                         label: "CollectionFold".to_string(),
-                        ty: DeclarationId(1844),
+                        ty: DeclarationId(1848),
                     },
                     Field {
                         label: "ArithmeticRepeat".to_string(),
-                        ty: DeclarationId(1845),
+                        ty: DeclarationId(1849),
                     },
                 ],
             },
@@ -21649,11 +21729,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7054, 7237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(840),
+            id: DeclarationId(843),
             name: Some("algebra_profile_to_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(53)],
-                output: DeclarationId(1818),
+                output: DeclarationId(1822),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     7370,
@@ -21671,11 +21751,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7290, 7863),
         });
         declarations.push(Declaration {
-            id: DeclarationId(841),
+            id: DeclarationId(844),
             name: Some("type_iteration_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(1819),
+                output: DeclarationId(1823),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     7935,
@@ -21693,17 +21773,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7865, 8154),
         });
         declarations.push(Declaration {
-            id: DeclarationId(842),
+            id: DeclarationId(845),
             name: Some("Mutability".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Immutable".to_string(),
-                        ty: DeclarationId(1846),
+                        ty: DeclarationId(1850),
                     },
                     Field {
                         label: "Mutable".to_string(),
-                        ty: DeclarationId(1847),
+                        ty: DeclarationId(1851),
                     },
                 ],
             },
@@ -21718,17 +21798,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 340, 381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(843),
+            id: DeclarationId(846),
             name: Some("Purity".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Pure".to_string(),
-                        ty: DeclarationId(1848),
+                        ty: DeclarationId(1852),
                     },
                     Field {
                         label: "Effectful".to_string(),
-                        ty: DeclarationId(1849),
+                        ty: DeclarationId(1853),
                     },
                 ],
             },
@@ -21743,17 +21823,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 598, 632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(844),
+            id: DeclarationId(847),
             name: Some("Structure".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ExplicitDAG".to_string(),
-                        ty: DeclarationId(1850),
+                        ty: DeclarationId(1854),
                     },
                     Field {
                         label: "Arbitrary".to_string(),
-                        ty: DeclarationId(1851),
+                        ty: DeclarationId(1855),
                     },
                 ],
             },
@@ -21768,17 +21848,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 891, 935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(845),
+            id: DeclarationId(848),
             name: Some("Iteration".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Bounded".to_string(),
-                        ty: DeclarationId(1852),
+                        ty: DeclarationId(1856),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1853),
+                        ty: DeclarationId(1857),
                     },
                 ],
             },
@@ -21793,25 +21873,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1147, 1187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(846),
+            id: DeclarationId(849),
             name: Some("ComputationModel".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "mutability".to_string(),
-                        ty: DeclarationId(842),
+                        ty: DeclarationId(845),
                     },
                     Field {
                         label: "purity".to_string(),
-                        ty: DeclarationId(843),
+                        ty: DeclarationId(846),
                     },
                     Field {
                         label: "structure".to_string(),
-                        ty: DeclarationId(844),
+                        ty: DeclarationId(847),
                     },
                     Field {
                         label: "iteration".to_string(),
-                        ty: DeclarationId(845),
+                        ty: DeclarationId(848),
                     },
                 ],
             },
@@ -21826,15 +21906,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1387, 1500),
         });
         declarations.push(Declaration {
-            id: DeclarationId(847),
+            id: DeclarationId(850),
             name: Some("dag_model".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(846),
+                template: DeclarationId(849),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(846)),
+            meta_tag: Some(DeclarationId(849)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -21842,28 +21922,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "mutability".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1846),
+                            constructor: DeclarationId(1850),
                             payload: vec![],
                         },
                     ),
                     (
                         "purity".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1848),
+                            constructor: DeclarationId(1852),
                             payload: vec![],
                         },
                     ),
                     (
                         "structure".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1850),
+                            constructor: DeclarationId(1854),
                             payload: vec![],
                         },
                     ),
                     (
                         "iteration".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1852),
+                            constructor: DeclarationId(1856),
                             payload: vec![],
                         },
                     ),
@@ -21874,25 +21954,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1502, 1625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(848),
+            id: DeclarationId(851),
             name: Some("MemoryModel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ValueOnly".to_string(),
-                        ty: DeclarationId(1854),
+                        ty: DeclarationId(1858),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(1855),
+                        ty: DeclarationId(1859),
                     },
                     Field {
                         label: "RefCounted".to_string(),
-                        ty: DeclarationId(1856),
+                        ty: DeclarationId(1860),
                     },
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(1857),
+                        ty: DeclarationId(1861),
                     },
                 ],
             },
@@ -21907,17 +21987,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2014, 2099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(849),
+            id: DeclarationId(852),
             name: Some("ScopeModel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LexicalScoping".to_string(),
-                        ty: DeclarationId(1858),
+                        ty: DeclarationId(1862),
                     },
                     Field {
                         label: "DynamicScoping".to_string(),
-                        ty: DeclarationId(1859),
+                        ty: DeclarationId(1863),
                     },
                 ],
             },
@@ -21932,17 +22012,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2365, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(850),
+            id: DeclarationId(853),
             name: Some("TargetExecutionModel".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "memory".to_string(),
-                        ty: DeclarationId(848),
+                        ty: DeclarationId(851),
                     },
                     Field {
                         label: "scope".to_string(),
-                        ty: DeclarationId(849),
+                        ty: DeclarationId(852),
                     },
                 ],
             },
@@ -21957,12 +22037,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2561, 2632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(851),
+            id: DeclarationId(854),
             name: Some("SourceFiltering".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "excluded_prefixes".to_string(),
-                    ty: DeclarationId(1860),
+                    ty: DeclarationId(1864),
                 }],
             },
             type_params: vec![],
@@ -21976,17 +22056,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2774, 2832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(852),
+            id: DeclarationId(855),
             name: Some("ShapeATargetSourceFiltering".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "internal".to_string(),
-                        ty: DeclarationId(851),
+                        ty: DeclarationId(854),
                     },
                     Field {
                         label: "additional_excluded_prefixes".to_string(),
-                        ty: DeclarationId(1861),
+                        ty: DeclarationId(1865),
                     },
                 ],
             },
@@ -22001,15 +22081,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3115, 3224),
         });
         declarations.push(Declaration {
-            id: DeclarationId(853),
+            id: DeclarationId(856),
             name: Some("internal_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(851),
+                template: DeclarationId(854),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(851)),
+            meta_tag: Some(DeclarationId(854)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -22028,17 +22108,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3226, 3381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(854),
+            id: DeclarationId(857),
             name: Some("ExecutionModelRequirement".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(1862),
+                        ty: DeclarationId(1866),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(1863),
+                        ty: DeclarationId(1867),
                     },
                 ],
             },
@@ -22053,37 +22133,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3659, 3729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(855),
+            id: DeclarationId(858),
             name: Some("CompilerDiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(1864),
+                        ty: DeclarationId(1868),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(1865),
+                        ty: DeclarationId(1869),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(1866),
+                        ty: DeclarationId(1870),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(1867),
+                        ty: DeclarationId(1871),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(1868),
+                        ty: DeclarationId(1872),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(1869),
+                        ty: DeclarationId(1873),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(1870),
+                        ty: DeclarationId(1874),
                     },
                 ],
             },
@@ -22098,7 +22178,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 990, 1148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(856),
+            id: DeclarationId(859),
             name: Some("Correction".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -22127,7 +22207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1354, 1607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(857),
+            id: DeclarationId(860),
             name: Some("DiagnosticKindDecl".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -22152,12 +22232,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 2387, 2450),
         });
         declarations.push(Declaration {
-            id: DeclarationId(858),
+            id: DeclarationId(861),
             name: Some("LensInstanceKindWitness".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "kind_decl".to_string(),
-                    ty: DeclarationId(1078),
+                    ty: DeclarationId(1081),
                 }],
             },
             type_params: vec![],
@@ -22171,17 +22251,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 4652, 4712),
         });
         declarations.push(Declaration {
-            id: DeclarationId(859),
+            id: DeclarationId(862),
             name: Some("AnyDiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CompilerKind".to_string(),
-                        ty: DeclarationId(1871),
+                        ty: DeclarationId(1875),
                     },
                     Field {
                         label: "LensInstanceKind".to_string(),
-                        ty: DeclarationId(1872),
+                        ty: DeclarationId(1876),
                     },
                 ],
             },
@@ -22196,13 +22276,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5321, 5430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(860),
+            id: DeclarationId(863),
             name: Some("Diagnostic".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(859),
+                        ty: DeclarationId(862),
                     },
                     Field {
                         label: "span".to_string(),
@@ -22214,7 +22294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fixes".to_string(),
-                        ty: DeclarationId(1873),
+                        ty: DeclarationId(1877),
                     },
                 ],
             },
@@ -22229,37 +22309,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5799, 5907),
         });
         declarations.push(Declaration {
-            id: DeclarationId(861),
+            id: DeclarationId(864),
             name: Some("EmissionDiagnostic".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UnderRefined".to_string(),
-                        ty: DeclarationId(1874),
+                        ty: DeclarationId(1878),
                     },
                     Field {
                         label: "NoInhabitant".to_string(),
-                        ty: DeclarationId(1875),
+                        ty: DeclarationId(1879),
                     },
                     Field {
                         label: "ContradictoryUse".to_string(),
-                        ty: DeclarationId(1877),
+                        ty: DeclarationId(1881),
                     },
                     Field {
                         label: "OutOfR2Scope".to_string(),
-                        ty: DeclarationId(1878),
+                        ty: DeclarationId(1882),
                     },
                     Field {
                         label: "LifetimeProgramExtractionPending".to_string(),
-                        ty: DeclarationId(1879),
+                        ty: DeclarationId(1883),
                     },
                     Field {
                         label: "FoldNotImplemented".to_string(),
-                        ty: DeclarationId(1880),
+                        ty: DeclarationId(1884),
                     },
                     Field {
                         label: "MissingEmissionPath".to_string(),
-                        ty: DeclarationId(1881),
+                        ty: DeclarationId(1885),
                     },
                 ],
             },
@@ -22274,21 +22354,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 8541, 11258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(862),
+            id: DeclarationId(865),
             name: Some("Witness".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Inhabits".to_string(),
-                        ty: DeclarationId(1896),
+                        ty: DeclarationId(1900),
                     },
                     Field {
                         label: "Violates".to_string(),
-                        ty: DeclarationId(1897),
+                        ty: DeclarationId(1901),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(863)],
+            type_params: vec![DeclarationId(866)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -22299,7 +22379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1600, 1689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(863),
+            id: DeclarationId(866),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -22313,17 +22393,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1600, 1689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(864),
+            id: DeclarationId(867),
             name: Some("OptionalDiagnostic".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "NoDiagnostic".to_string(),
-                        ty: DeclarationId(1898),
+                        ty: DeclarationId(1902),
                     },
                     Field {
                         label: "SomeDiagnostic".to_string(),
-                        ty: DeclarationId(1899),
+                        ty: DeclarationId(1903),
                     },
                 ],
             },
@@ -22338,21 +22418,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1843, 1924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(865),
+            id: DeclarationId(868),
             name: Some("DimensionReport".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DimensionOk".to_string(),
-                        ty: DeclarationId(1902),
+                        ty: DeclarationId(1906),
                     },
                     Field {
                         label: "DimensionFail".to_string(),
-                        ty: DeclarationId(1906),
+                        ty: DeclarationId(1910),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(866)],
+            type_params: vec![DeclarationId(869)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -22363,7 +22443,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2283, 2559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(866),
+            id: DeclarationId(869),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -22377,7 +22457,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2283, 2559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(867),
+            id: DeclarationId(870),
             name: Some("AnalysisDimension".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -22387,23 +22467,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "witness_of".to_string(),
-                        ty: DeclarationId(1908),
+                        ty: DeclarationId(1912),
                     },
                     Field {
                         label: "compose".to_string(),
-                        ty: DeclarationId(1909),
+                        ty: DeclarationId(1913),
                     },
                     Field {
                         label: "identity".to_string(),
-                        ty: DeclarationId(868),
+                        ty: DeclarationId(871),
                     },
                     Field {
                         label: "break_diagnostic".to_string(),
-                        ty: DeclarationId(1910),
+                        ty: DeclarationId(1914),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(868)],
+            type_params: vec![DeclarationId(871)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -22414,7 +22494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3132, 3361),
         });
         declarations.push(Declaration {
-            id: DeclarationId(868),
+            id: DeclarationId(871),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -22428,18 +22508,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3132, 3361),
         });
         declarations.push(Declaration {
-            id: DeclarationId(869),
+            id: DeclarationId(872),
             name: Some("Dimension".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "value".to_string(),
-                    ty: DeclarationId(871),
+                    ty: DeclarationId(874),
                 }],
             },
-            type_params: vec![DeclarationId(870), DeclarationId(871)],
+            type_params: vec![DeclarationId(873), DeclarationId(874)],
             phantom_params: vec![PhantomParameter {
-                parameter: DeclarationId(870),
-                algebra: DeclarationId(1911),
+                parameter: DeclarationId(873),
+                algebra: DeclarationId(1915),
             }],
             meta_tag: None,
             specialization_parent: None,
@@ -22450,7 +22530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4002, 4052),
         });
         declarations.push(Declaration {
-            id: DeclarationId(870),
+            id: DeclarationId(873),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -22464,7 +22544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4002, 4052),
         });
         declarations.push(Declaration {
-            id: DeclarationId(871),
+            id: DeclarationId(874),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -22478,7 +22558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4002, 4052),
         });
         declarations.push(Declaration {
-            id: DeclarationId(872),
+            id: DeclarationId(875),
             name: Some("Meters".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -22492,7 +22572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4054, 4065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(873),
+            id: DeclarationId(876),
             name: Some("Seconds".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -22506,7 +22586,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4066, 4078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(874),
+            id: DeclarationId(877),
             name: Some("Kilograms".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -22520,7 +22600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4079, 4093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(875),
+            id: DeclarationId(878),
             name: Some("Amperes".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -22534,7 +22614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4094, 4106),
         });
         declarations.push(Declaration {
-            id: DeclarationId(876),
+            id: DeclarationId(879),
             name: Some("Kelvin".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -22548,7 +22628,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4107, 4118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(877),
+            id: DeclarationId(880),
             name: Some("Moles".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -22562,7 +22642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4119, 4129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(878),
+            id: DeclarationId(881),
             name: Some("Candela".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -22576,18 +22656,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4130, 4142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(879),
+            id: DeclarationId(882),
             name: Some("add_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1882),
-                    DeclarationId(1883),
-                    DeclarationId(1884),
+                    DeclarationId(1886),
+                    DeclarationId(1887),
+                    DeclarationId(1888),
                 ],
-                output: DeclarationId(1885),
+                output: DeclarationId(1889),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4316, 4338)),
             },
-            type_params: vec![DeclarationId(880), DeclarationId(881)],
+            type_params: vec![DeclarationId(883), DeclarationId(884)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -22598,7 +22678,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4144, 4338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(880),
+            id: DeclarationId(883),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -22612,7 +22692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4144, 4338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(881),
+            id: DeclarationId(884),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -22626,18 +22706,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4144, 4338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(882),
+            id: DeclarationId(885),
             name: Some("sub_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1886),
-                    DeclarationId(1887),
-                    DeclarationId(1888),
+                    DeclarationId(1890),
+                    DeclarationId(1891),
+                    DeclarationId(1892),
                 ],
-                output: DeclarationId(1889),
+                output: DeclarationId(1893),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4512, 4534)),
             },
-            type_params: vec![DeclarationId(883), DeclarationId(884)],
+            type_params: vec![DeclarationId(886), DeclarationId(887)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -22648,7 +22728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4340, 4534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(883),
+            id: DeclarationId(886),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -22662,7 +22742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4340, 4534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(884),
+            id: DeclarationId(887),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -22676,14 +22756,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4340, 4534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(885),
+            id: DeclarationId(888),
             name: Some("mul_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1890), DeclarationId(1891), DeclarationId(887)],
-                output: DeclarationId(1892),
+                inputs: vec![DeclarationId(1894), DeclarationId(1895), DeclarationId(890)],
+                output: DeclarationId(1896),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4700, 4729)),
             },
-            type_params: vec![DeclarationId(886), DeclarationId(887)],
+            type_params: vec![DeclarationId(889), DeclarationId(890)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -22694,7 +22774,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4536, 4729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(886),
+            id: DeclarationId(889),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -22708,7 +22788,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4536, 4729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(887),
+            id: DeclarationId(890),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -22722,14 +22802,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4536, 4729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(888),
+            id: DeclarationId(891),
             name: Some("div_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1893), DeclarationId(1894), DeclarationId(890)],
-                output: DeclarationId(1895),
+                inputs: vec![DeclarationId(1897), DeclarationId(1898), DeclarationId(893)],
+                output: DeclarationId(1899),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4895, 4924)),
             },
-            type_params: vec![DeclarationId(889), DeclarationId(890)],
+            type_params: vec![DeclarationId(892), DeclarationId(893)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -22740,7 +22820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4731, 4924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(889),
+            id: DeclarationId(892),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -22754,7 +22834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4731, 4924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(890),
+            id: DeclarationId(893),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -22768,17 +22848,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4731, 4924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(891),
+            id: DeclarationId(894),
             name: Some("TypeRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -22790,7 +22870,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(1912),
+                        ty: DeclarationId(1916),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -22809,29 +22889,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 736, 887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(892),
+            id: DeclarationId(895),
             name: Some("TargetIntegerTypeInhabitance".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "kernel_integer".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "bound".to_string(),
-                        ty: DeclarationId(893),
+                        ty: DeclarationId(896),
                     },
                     Field {
                         label: "type_realization".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                 ],
             },
@@ -22846,17 +22926,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 2521, 2718),
         });
         declarations.push(Declaration {
-            id: DeclarationId(893),
+            id: DeclarationId(896),
             name: Some("TargetIntegerInhabitanceBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BoundUnspecified".to_string(),
-                        ty: DeclarationId(1913),
+                        ty: DeclarationId(1917),
                     },
                     Field {
                         label: "StaticBoundFact".to_string(),
-                        ty: DeclarationId(1914),
+                        ty: DeclarationId(1918),
                     },
                 ],
             },
@@ -22871,7 +22951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4149, 4237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(894),
+            id: DeclarationId(897),
             name: Some("FieldBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -22881,7 +22961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "access".to_string(),
-                        ty: DeclarationId(895),
+                        ty: DeclarationId(898),
                     },
                     Field {
                         label: "borrowed_read".to_string(),
@@ -22900,17 +22980,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4239, 4323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(895),
+            id: DeclarationId(898),
             name: Some("FieldAccess".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DirectField".to_string(),
-                        ty: DeclarationId(1915),
+                        ty: DeclarationId(1919),
                     },
                     Field {
                         label: "AccessorMethod".to_string(),
-                        ty: DeclarationId(1916),
+                        ty: DeclarationId(1920),
                     },
                 ],
             },
@@ -22925,21 +23005,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4706, 4773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(896),
+            id: DeclarationId(899),
             name: Some("OperatorRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "op".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -22962,17 +23042,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4775, 4906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(897),
+            id: DeclarationId(900),
             name: Some("BehaviorRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -22995,25 +23075,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4908, 5018),
         });
         declarations.push(Declaration {
-            id: DeclarationId(898),
+            id: DeclarationId(901),
             name: Some("CallableRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(906),
+                        ty: DeclarationId(909),
                     },
                     Field {
                         label: "parameters".to_string(),
-                        ty: DeclarationId(1917),
+                        ty: DeclarationId(1921),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -23032,7 +23112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5020, 5179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(899),
+            id: DeclarationId(902),
             name: Some("CallableParameter".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23042,7 +23122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "disposition".to_string(),
-                        ty: DeclarationId(900),
+                        ty: DeclarationId(903),
                     },
                 ],
             },
@@ -23057,17 +23137,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5601, 5675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(900),
+            id: DeclarationId(903),
             name: Some("ParameterDisposition".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(1918),
+                        ty: DeclarationId(1922),
                     },
                     Field {
                         label: "Consumed".to_string(),
-                        ty: DeclarationId(1919),
+                        ty: DeclarationId(1923),
                     },
                 ],
             },
@@ -23082,17 +23162,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6132, 6183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(901),
+            id: DeclarationId(904),
             name: Some("StringOwnershipAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Owned".to_string(),
-                        ty: DeclarationId(1920),
+                        ty: DeclarationId(1924),
                     },
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(1921),
+                        ty: DeclarationId(1925),
                     },
                 ],
             },
@@ -23107,17 +23187,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6595, 6642),
         });
         declarations.push(Declaration {
-            id: DeclarationId(902),
+            id: DeclarationId(905),
             name: Some("StringLifetimeAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SelfContained".to_string(),
-                        ty: DeclarationId(1922),
+                        ty: DeclarationId(1926),
                     },
                     Field {
                         label: "Caller".to_string(),
-                        ty: DeclarationId(1923),
+                        ty: DeclarationId(1927),
                     },
                 ],
             },
@@ -23132,21 +23212,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6950, 7002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(903),
+            id: DeclarationId(906),
             name: Some("StringGrowabilityAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Growable".to_string(),
-                        ty: DeclarationId(1924),
+                        ty: DeclarationId(1928),
                     },
                     Field {
                         label: "Fixed".to_string(),
-                        ty: DeclarationId(1925),
+                        ty: DeclarationId(1929),
                     },
                     Field {
                         label: "NotApplicable".to_string(),
-                        ty: DeclarationId(1926),
+                        ty: DeclarationId(1930),
                     },
                 ],
             },
@@ -23161,12 +23241,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7229, 7296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(904),
+            id: DeclarationId(907),
             name: Some("StringEncodingAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Utf8FreeMonoidChar".to_string(),
-                    ty: DeclarationId(1927),
+                    ty: DeclarationId(1931),
                 }],
             },
             type_params: vec![],
@@ -23180,17 +23260,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7605, 7651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(905),
+            id: DeclarationId(908),
             name: Some("TypeInstantiationRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -23213,49 +23293,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7653, 7772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(906),
+            id: DeclarationId(909),
             name: Some("CallableStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ListEmpty".to_string(),
-                        ty: DeclarationId(1928),
+                        ty: DeclarationId(1932),
                     },
                     Field {
                         label: "ListSingleton".to_string(),
-                        ty: DeclarationId(1929),
+                        ty: DeclarationId(1933),
                     },
                     Field {
                         label: "ListCons".to_string(),
-                        ty: DeclarationId(1930),
+                        ty: DeclarationId(1934),
                     },
                     Field {
                         label: "ListConcat".to_string(),
-                        ty: DeclarationId(1931),
+                        ty: DeclarationId(1935),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(1932),
+                        ty: DeclarationId(1936),
                     },
                     Field {
                         label: "ListIsEmpty".to_string(),
-                        ty: DeclarationId(1933),
+                        ty: DeclarationId(1937),
                     },
                     Field {
                         label: "ListFold".to_string(),
-                        ty: DeclarationId(1934),
+                        ty: DeclarationId(1938),
                     },
                     Field {
                         label: "ListMap".to_string(),
-                        ty: DeclarationId(1935),
+                        ty: DeclarationId(1939),
                     },
                     Field {
                         label: "ListFilter".to_string(),
-                        ty: DeclarationId(1936),
+                        ty: DeclarationId(1940),
                     },
                     Field {
                         label: "ListContains".to_string(),
-                        ty: DeclarationId(1937),
+                        ty: DeclarationId(1941),
                     },
                 ],
             },
@@ -23270,29 +23350,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8177, 8346),
         });
         declarations.push(Declaration {
-            id: DeclarationId(907),
+            id: DeclarationId(910),
             name: Some("PatternRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(908),
+                        ty: DeclarationId(911),
                     },
                     Field {
                         label: "empty_variant".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "cons_variant".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "scrutinee".to_string(),
@@ -23331,17 +23411,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 10285, 10574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(908),
+            id: DeclarationId(911),
             name: Some("PatternStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PlaceholderPatternStrategy".to_string(),
-                        ty: DeclarationId(1938),
+                        ty: DeclarationId(1942),
                     },
                     Field {
                         label: "VectorList".to_string(),
-                        ty: DeclarationId(1939),
+                        ty: DeclarationId(1943),
                     },
                 ],
             },
@@ -23356,7 +23436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11014, 11080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(909),
+            id: DeclarationId(912),
             name: Some("StatementSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23381,7 +23461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11082, 11159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(910),
+            id: DeclarationId(913),
             name: Some("ExpressionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23410,7 +23490,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11161, 11251),
         });
         declarations.push(Declaration {
-            id: DeclarationId(911),
+            id: DeclarationId(914),
             name: Some("ForEachSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23435,7 +23515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11253, 11312),
         });
         declarations.push(Declaration {
-            id: DeclarationId(912),
+            id: DeclarationId(915),
             name: Some("ControlFlowSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23449,7 +23529,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "for_each_syntax".to_string(),
-                        ty: DeclarationId(911),
+                        ty: DeclarationId(914),
                     },
                 ],
             },
@@ -23464,7 +23544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11314, 11411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(913),
+            id: DeclarationId(916),
             name: Some("LiteralSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23493,7 +23573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11413, 11509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(914),
+            id: DeclarationId(917),
             name: Some("ModuleSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -23512,7 +23592,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11511, 11557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(915),
+            id: DeclarationId(918),
             name: Some("FunctionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23549,7 +23629,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11559, 11711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(916),
+            id: DeclarationId(919),
             name: Some("TypeApplicationSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -23568,7 +23648,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11713, 11762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(917),
+            id: DeclarationId(920),
             name: Some("TypeDefinitionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23605,7 +23685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11976, 12124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(918),
+            id: DeclarationId(921),
             name: Some("RecordDeriveTemplateBundle".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23630,7 +23710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12785, 12878),
         });
         declarations.push(Declaration {
-            id: DeclarationId(919),
+            id: DeclarationId(922),
             name: Some("PatternMatchSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23679,7 +23759,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 13582, 13822),
         });
         declarations.push(Declaration {
-            id: DeclarationId(920),
+            id: DeclarationId(923),
             name: Some("CollectionOps".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23736,7 +23816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 13824, 14023),
         });
         declarations.push(Declaration {
-            id: DeclarationId(921),
+            id: DeclarationId(924),
             name: Some("ValueConstructionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23773,17 +23853,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 14025, 14211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(922),
+            id: DeclarationId(925),
             name: Some("RenderingModel".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(923),
+                        ty: DeclarationId(926),
                     },
                     Field {
                         label: "construct".to_string(),
-                        ty: DeclarationId(924),
+                        ty: DeclarationId(927),
                     },
                 ],
             },
@@ -23798,17 +23878,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 14213, 14288),
         });
         declarations.push(Declaration {
-            id: DeclarationId(923),
+            id: DeclarationId(926),
             name: Some("ReadStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Borrow".to_string(),
-                        ty: DeclarationId(1940),
+                        ty: DeclarationId(1944),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(1941),
+                        ty: DeclarationId(1945),
                     },
                 ],
             },
@@ -23823,17 +23903,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 14786, 14830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(924),
+            id: DeclarationId(927),
             name: Some("ConstructStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CopyOrClone".to_string(),
-                        ty: DeclarationId(1942),
+                        ty: DeclarationId(1946),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(1943),
+                        ty: DeclarationId(1947),
                     },
                 ],
             },
@@ -23848,57 +23928,57 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 15123, 15177),
         });
         declarations.push(Declaration {
-            id: DeclarationId(925),
+            id: DeclarationId(928),
             name: Some("LanguageSpec".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "statements".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "expressions".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "control_flow".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "literals".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "modules".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "functions".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "type_applications".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "type_definitions".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "record_derive_templates".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "patterns".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "collection_ops".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "values".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                 ],
             },
@@ -23913,17 +23993,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 15179, 15705),
         });
         declarations.push(Declaration {
-            id: DeclarationId(926),
+            id: DeclarationId(929),
             name: Some("PlaceholderConvention".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IndexedArgs".to_string(),
-                        ty: DeclarationId(1944),
+                        ty: DeclarationId(1948),
                     },
                     Field {
                         label: "NamedArg".to_string(),
-                        ty: DeclarationId(1945),
+                        ty: DeclarationId(1949),
                     },
                 ],
             },
@@ -23938,17 +24018,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17079, 17134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(927),
+            id: DeclarationId(930),
             name: Some("MethodEmitTemplate".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SingleTemplate".to_string(),
-                        ty: DeclarationId(1946),
+                        ty: DeclarationId(1950),
                     },
                     Field {
                         label: "HigherOrderTemplates".to_string(),
-                        ty: DeclarationId(1947),
+                        ty: DeclarationId(1951),
                     },
                 ],
             },
@@ -23963,7 +24043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 18269, 18425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(928),
+            id: DeclarationId(931),
             name: Some("MethodTemplateContract".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23977,7 +24057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "emit_template".to_string(),
-                        ty: DeclarationId(927),
+                        ty: DeclarationId(930),
                     },
                     Field {
                         label: "wraps_result".to_string(),
@@ -23985,7 +24065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "placeholder_convention".to_string(),
-                        ty: DeclarationId(926),
+                        ty: DeclarationId(929),
                     },
                 ],
             },
@@ -24000,7 +24080,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20218, 20405),
         });
         declarations.push(Declaration {
-            id: DeclarationId(929),
+            id: DeclarationId(932),
             name: Some("BootstrapFixture".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -24019,29 +24099,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1395, 1443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(930),
+            id: DeclarationId(933),
             name: Some("BootstrapFixtureSet".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "rust_pilot_primitives".to_string(),
-                        ty: DeclarationId(929),
+                        ty: DeclarationId(932),
                     },
                     Field {
                         label: "rust_method_template_contracts".to_string(),
-                        ty: DeclarationId(929),
+                        ty: DeclarationId(932),
                     },
                     Field {
                         label: "python_method_template_contracts".to_string(),
-                        ty: DeclarationId(929),
+                        ty: DeclarationId(932),
                     },
                     Field {
                         label: "go_method_template_contracts".to_string(),
-                        ty: DeclarationId(929),
+                        ty: DeclarationId(932),
                     },
                     Field {
                         label: "anthropic_operations".to_string(),
-                        ty: DeclarationId(929),
+                        ty: DeclarationId(932),
                     },
                 ],
             },
@@ -24056,15 +24136,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1600, 1864),
         });
         declarations.push(Declaration {
-            id: DeclarationId(931),
+            id: DeclarationId(934),
             name: Some("bootstrap_fixture_authority".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(930),
+                template: DeclarationId(933),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(930)),
+            meta_tag: Some(DeclarationId(933)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -24121,18 +24201,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1866, 2426),
         });
         declarations.push(Declaration {
-            id: DeclarationId(932),
+            id: DeclarationId(935),
             name: Some("go_method_template_contracts".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(928),
+                    value: DeclarationId(931),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1948)),
+            meta_tag: Some(DeclarationId(1952)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -24151,7 +24231,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -24164,7 +24244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -24186,7 +24266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Join({recv}, {arg})".to_string(),
                             ))],
@@ -24199,7 +24279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -24221,7 +24301,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Split({recv}, {arg})".to_string(),
                             ))],
@@ -24234,7 +24314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -24256,7 +24336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({recv}, {arg}...)".to_string(),
                             ))],
@@ -24269,7 +24349,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -24291,7 +24371,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Map({recv}, {arg})".to_string(),
                             ))],
@@ -24304,7 +24384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -24326,7 +24406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Filter({recv}, {arg})".to_string(),
                             ))],
@@ -24339,7 +24419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -24361,7 +24441,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Any({recv}, {arg})".to_string(),
                             ))],
@@ -24374,7 +24454,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -24396,7 +24476,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.All({recv}, {arg})".to_string(),
                             ))],
@@ -24409,7 +24489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -24431,7 +24511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.FlatMap({recv}, {arg})".to_string(),
                             ))],
@@ -24444,7 +24524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -24464,7 +24544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -24477,7 +24557,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -24497,7 +24577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -24510,7 +24590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -24532,7 +24612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Fold({recv}, {arg})".to_string(),
                             ))],
@@ -24545,7 +24625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -24567,7 +24647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.SortBy({recv}, {arg})".to_string(),
                             ))],
@@ -24580,7 +24660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -24602,7 +24682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({recv}, {arg})".to_string(),
                             ))],
@@ -24615,7 +24695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -24626,29 +24706,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 2423, 5757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(933),
+            id: DeclarationId(936),
             name: Some("RecursionShape".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DirectRecursion".to_string(),
-                        ty: DeclarationId(1958),
+                        ty: DeclarationId(1962),
                     },
                     Field {
                         label: "ListRecursion".to_string(),
-                        ty: DeclarationId(1959),
+                        ty: DeclarationId(1963),
                     },
                     Field {
                         label: "OptionalRecursion".to_string(),
-                        ty: DeclarationId(1960),
+                        ty: DeclarationId(1964),
                     },
                     Field {
                         label: "SetRecursion".to_string(),
-                        ty: DeclarationId(1961),
+                        ty: DeclarationId(1965),
                     },
                     Field {
                         label: "MapValueRecursion".to_string(),
-                        ty: DeclarationId(1962),
+                        ty: DeclarationId(1966),
                     },
                 ],
             },
@@ -24663,7 +24743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5538, 5811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(934),
+            id: DeclarationId(937),
             name: Some("InductiveField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -24681,7 +24761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "shape".to_string(),
-                        ty: DeclarationId(933),
+                        ty: DeclarationId(936),
                     },
                     Field {
                         label: "element_type".to_string(),
@@ -24700,10 +24780,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 7103, 7525),
         });
         declarations.push(Declaration {
-            id: DeclarationId(935),
+            id: DeclarationId(938),
             name: Some("recursion_shape_eq".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(933), DeclarationId(933)],
+                inputs: vec![DeclarationId(936), DeclarationId(936)],
                 output: DeclarationId(99),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 7595, 7967)),
             },
@@ -24718,10 +24798,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 7527, 7967),
         });
         declarations.push(Declaration {
-            id: DeclarationId(936),
+            id: DeclarationId(939),
             name: Some("inductive_field_eq".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(934), DeclarationId(934)],
+                inputs: vec![DeclarationId(937), DeclarationId(937)],
                 output: DeclarationId(99),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8037, 8235)),
             },
@@ -24736,11 +24816,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 7969, 8235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(937),
+            id: DeclarationId(940),
             name: Some("inductive_field_to_dimension".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(934), DeclarationId(197)],
-                output: DeclarationId(1032),
+                inputs: vec![DeclarationId(937), DeclarationId(197)],
+                output: DeclarationId(1035),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8701, 8732)),
             },
             type_params: vec![],
@@ -24754,29 +24834,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 8611, 8732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(938),
+            id: DeclarationId(941),
             name: Some("SubValueRelation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "StrictSubValue".to_string(),
-                        ty: DeclarationId(1963),
+                        ty: DeclarationId(1967),
                     },
                     Field {
                         label: "IteratedSubValue".to_string(),
-                        ty: DeclarationId(1964),
+                        ty: DeclarationId(1968),
                     },
                     Field {
                         label: "ArithmeticDescent".to_string(),
-                        ty: DeclarationId(1965),
+                        ty: DeclarationId(1969),
                     },
                     Field {
                         label: "PreservedValue".to_string(),
-                        ty: DeclarationId(1966),
+                        ty: DeclarationId(1970),
                     },
                     Field {
                         label: "SubValueUnknown".to_string(),
-                        ty: DeclarationId(1967),
+                        ty: DeclarationId(1971),
                     },
                 ],
             },
@@ -24791,11 +24871,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 9878, 10114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(939),
+            id: DeclarationId(942),
             name: Some("sub_value_to_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(938)],
-                output: DeclarationId(1025),
+                inputs: vec![DeclarationId(941)],
+                output: DeclarationId(1028),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     11067,
@@ -24813,10 +24893,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10995, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(940),
+            id: DeclarationId(943),
             name: Some("shrink_factor_eq".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(831), DeclarationId(831)],
+                inputs: vec![DeclarationId(834), DeclarationId(834)],
                 output: DeclarationId(99),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -24835,11 +24915,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 12115, 12677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(941),
+            id: DeclarationId(944),
             name: Some("meet_sub_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(938), DeclarationId(938)],
-                output: DeclarationId(938),
+                inputs: vec![DeclarationId(941), DeclarationId(941)],
+                output: DeclarationId(941),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     13200,
@@ -24857,11 +24937,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 13120, 14612),
         });
         declarations.push(Declaration {
-            id: DeclarationId(942),
+            id: DeclarationId(945),
             name: Some("join_sub_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(938), DeclarationId(938)],
-                output: DeclarationId(938),
+                inputs: vec![DeclarationId(941), DeclarationId(941)],
+                output: DeclarationId(941),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     14944,
@@ -24879,11 +24959,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 14864, 16247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(943),
+            id: DeclarationId(946),
             name: Some("compose_sub_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(938), DeclarationId(934)],
-                output: DeclarationId(938),
+                inputs: vec![DeclarationId(941), DeclarationId(937)],
+                output: DeclarationId(941),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     17356,
@@ -24901,11 +24981,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 17268, 17478),
         });
         declarations.push(Declaration {
-            id: DeclarationId(944),
+            id: DeclarationId(947),
             name: Some("compose_sub_value_relations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(938), DeclarationId(938)],
-                output: DeclarationId(938),
+                inputs: vec![DeclarationId(941), DeclarationId(941)],
+                output: DeclarationId(941),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     18334,
@@ -24923,11 +25003,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 18226, 19680),
         });
         declarations.push(Declaration {
-            id: DeclarationId(945),
+            id: DeclarationId(948),
             name: Some("sub_value_to_call_pattern".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(938)],
-                output: DeclarationId(1949),
+                inputs: vec![DeclarationId(941)],
+                output: DeclarationId(1953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     20455,
@@ -24945,11 +25025,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 20382, 21251),
         });
         declarations.push(Declaration {
-            id: DeclarationId(946),
+            id: DeclarationId(949),
             name: Some("sub_value_to_lowering_target".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(938)],
-                output: DeclarationId(1950),
+                inputs: vec![DeclarationId(941)],
+                output: DeclarationId(1954),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     21843,
@@ -24967,25 +25047,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 21764, 22748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(947),
+            id: DeclarationId(950),
             name: Some("PolynomialExponent".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerExpZero".to_string(),
-                        ty: DeclarationId(1968),
+                        ty: DeclarationId(1972),
                     },
                     Field {
                         label: "IntegerExpPos".to_string(),
-                        ty: DeclarationId(1969),
+                        ty: DeclarationId(1973),
                     },
                     Field {
                         label: "FractionExp".to_string(),
-                        ty: DeclarationId(1970),
+                        ty: DeclarationId(1974),
                     },
                     Field {
                         label: "LogBasedExp".to_string(),
-                        ty: DeclarationId(1971),
+                        ty: DeclarationId(1975),
                     },
                 ],
             },
@@ -25000,11 +25080,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 23991, 24246),
         });
         declarations.push(Declaration {
-            id: DeclarationId(948),
+            id: DeclarationId(951),
             name: Some("poly_exp_degree_one".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(947),
+                output: DeclarationId(950),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     24295,
@@ -25022,17 +25102,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24248, 24334),
         });
         declarations.push(Declaration {
-            id: DeclarationId(949),
+            id: DeclarationId(952),
             name: Some("AtomicCost".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PolyCost".to_string(),
-                        ty: DeclarationId(1972),
+                        ty: DeclarationId(1976),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(1973),
+                        ty: DeclarationId(1977),
                     },
                 ],
             },
@@ -25047,37 +25127,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24846, 24963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(950),
+            id: DeclarationId(953),
             name: Some("CostBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ConstantBound".to_string(),
-                        ty: DeclarationId(1974),
+                        ty: DeclarationId(1978),
                     },
                     Field {
                         label: "AtomicBound".to_string(),
-                        ty: DeclarationId(1975),
+                        ty: DeclarationId(1979),
                     },
                     Field {
                         label: "ProductBound".to_string(),
-                        ty: DeclarationId(1977),
+                        ty: DeclarationId(1981),
                     },
                     Field {
                         label: "SumOfProductsBound".to_string(),
-                        ty: DeclarationId(1980),
+                        ty: DeclarationId(1984),
                     },
                     Field {
                         label: "SumBound".to_string(),
-                        ty: DeclarationId(1982),
+                        ty: DeclarationId(1986),
                     },
                     Field {
                         label: "ForeverBound".to_string(),
-                        ty: DeclarationId(1983),
+                        ty: DeclarationId(1987),
                     },
                     Field {
                         label: "ErrorBound".to_string(),
-                        ty: DeclarationId(1984),
+                        ty: DeclarationId(1988),
                     },
                 ],
             },
@@ -25092,11 +25172,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26593, 27353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(951),
+            id: DeclarationId(954),
             name: Some("sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1951)],
-                output: DeclarationId(950),
+                inputs: vec![DeclarationId(1955)],
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     27764,
@@ -25114,10 +25194,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27714, 27870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(952),
+            id: DeclarationId(955),
             name: Some("cost_bound_is_sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(950)],
+                inputs: vec![DeclarationId(953)],
                 output: DeclarationId(99),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -25136,11 +25216,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 28145, 28447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(953),
+            id: DeclarationId(956),
             name: Some("cost_constant".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     28481,
@@ -25158,11 +25238,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 28449, 28498),
         });
         declarations.push(Declaration {
-            id: DeclarationId(954),
+            id: DeclarationId(957),
             name: Some("cost_linear".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     28542,
@@ -25180,11 +25260,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 28499, 28626),
         });
         declarations.push(Declaration {
-            id: DeclarationId(955),
+            id: DeclarationId(958),
             name: Some("cost_poly".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197), DeclarationId(81)],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     28681,
@@ -25202,11 +25282,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 28627, 29080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(956),
+            id: DeclarationId(959),
             name: Some("cost_root".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197), DeclarationId(81)],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29130,
@@ -25224,11 +25304,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29081, 29404),
         });
         declarations.push(Declaration {
-            id: DeclarationId(957),
+            id: DeclarationId(960),
             name: Some("cost_sqrt".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29446,
@@ -25246,11 +25326,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29405, 29479),
         });
         declarations.push(Declaration {
-            id: DeclarationId(958),
+            id: DeclarationId(961),
             name: Some("cost_cbrt".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29521,
@@ -25268,11 +25348,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29480, 29554),
         });
         declarations.push(Declaration {
-            id: DeclarationId(959),
+            id: DeclarationId(962),
             name: Some("cost_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29595,
@@ -25290,11 +25370,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29555, 29645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(960),
+            id: DeclarationId(963),
             name: Some("cost_nlogn".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29689,
@@ -25312,11 +25392,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29647, 29807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(961),
+            id: DeclarationId(964),
             name: Some("cost_graph_linear".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197), DeclarationId(197)],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29877,
@@ -25334,7 +25414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29809, 30053),
         });
         declarations.push(Declaration {
-            id: DeclarationId(962),
+            id: DeclarationId(965),
             name: Some("RecurrenceForm".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -25367,11 +25447,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 31210, 31301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(963),
+            id: DeclarationId(966),
             name: Some("int_add_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(1952),
+                output: DeclarationId(1956),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     31892,
@@ -25389,11 +25469,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 31849, 32143),
         });
         declarations.push(Declaration {
-            id: DeclarationId(964),
+            id: DeclarationId(967),
             name: Some("int_mul_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(1953),
+                output: DeclarationId(1957),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     32188,
@@ -25411,11 +25491,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 32145, 32977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(965),
+            id: DeclarationId(968),
             name: Some("bounded_int_pow_exponent".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(1954),
+                output: DeclarationId(1958),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33437,
@@ -25433,11 +25513,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33393, 33560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(966),
+            id: DeclarationId(969),
             name: Some("int_pow_bounded".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(1955),
+                output: DeclarationId(1959),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33912,
@@ -25455,11 +25535,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33864, 34957),
         });
         declarations.push(Declaration {
-            id: DeclarationId(967),
+            id: DeclarationId(970),
             name: Some("ceil_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(1956),
+                output: DeclarationId(1960),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35175,
@@ -25477,7 +25557,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35129, 35290),
         });
         declarations.push(Declaration {
-            id: DeclarationId(968),
+            id: DeclarationId(971),
             name: Some("ceil_log_iter".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
@@ -25486,7 +25566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     DeclarationId(81),
                     DeclarationId(81),
                 ],
-                output: DeclarationId(1957),
+                output: DeclarationId(1961),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35447,
@@ -25504,11 +25584,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35376, 35809),
         });
         declarations.push(Declaration {
-            id: DeclarationId(969),
+            id: DeclarationId(972),
             name: Some("master_theorem".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(962)],
-                output: DeclarationId(950),
+                inputs: vec![DeclarationId(965)],
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35864,
@@ -25526,11 +25606,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35811, 37901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(970),
+            id: DeclarationId(973),
             name: Some("catamorphism_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197), DeclarationId(81)],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     38254,
@@ -25548,16 +25628,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 38184, 38412),
         });
         declarations.push(Declaration {
-            id: DeclarationId(971),
+            id: DeclarationId(974),
             name: Some("derive_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
                     DeclarationId(197),
                     DeclarationId(81),
-                    DeclarationId(831),
+                    DeclarationId(834),
                     DeclarationId(81),
                 ],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     38911,
@@ -25575,11 +25655,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 38810, 39935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(972),
+            id: DeclarationId(975),
             name: Some("tree_traversal_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     40268,
@@ -25597,11 +25677,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 40229, 40325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(973),
+            id: DeclarationId(976),
             name: Some("nested_iteration_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     40368,
@@ -25619,11 +25699,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 40327, 40426),
         });
         declarations.push(Declaration {
-            id: DeclarationId(974),
+            id: DeclarationId(977),
             name: Some("linear_scan_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     40526,
@@ -25641,11 +25721,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 40490, 40581),
         });
         declarations.push(Declaration {
-            id: DeclarationId(975),
+            id: DeclarationId(978),
             name: Some("binary_search_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     40778,
@@ -25663,11 +25743,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 40740, 40893),
         });
         declarations.push(Declaration {
-            id: DeclarationId(976),
+            id: DeclarationId(979),
             name: Some("mergesort_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     40973,
@@ -25685,11 +25765,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 40939, 41088),
         });
         declarations.push(Declaration {
-            id: DeclarationId(977),
+            id: DeclarationId(980),
             name: Some("karatsuba_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41255,
@@ -25707,11 +25787,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 41221, 41374),
         });
         declarations.push(Declaration {
-            id: DeclarationId(978),
+            id: DeclarationId(981),
             name: Some("strassen_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41539,
@@ -25729,11 +25809,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 41506, 41653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(979),
+            id: DeclarationId(982),
             name: Some("trial_division_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41770,
@@ -25751,11 +25831,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 41731, 41795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(980),
+            id: DeclarationId(983),
             name: Some("cube_root_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41830,
@@ -25773,11 +25853,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 41796, 41855),
         });
         declarations.push(Declaration {
-            id: DeclarationId(981),
+            id: DeclarationId(984),
             name: Some("kth_root_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41937,
@@ -25795,11 +25875,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 41898, 41968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(982),
+            id: DeclarationId(985),
             name: Some("bfs_dfs_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42204,
@@ -25817,11 +25897,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 42172, 42255),
         });
         declarations.push(Declaration {
-            id: DeclarationId(983),
+            id: DeclarationId(986),
             name: Some("dijkstra_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42346,
@@ -25839,11 +25919,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 42313, 42628),
         });
         declarations.push(Declaration {
-            id: DeclarationId(984),
+            id: DeclarationId(987),
             name: Some("bellman_ford_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42731,
@@ -25861,11 +25941,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 42694, 42891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(985),
+            id: DeclarationId(988),
             name: Some("floyd_warshall_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42998,
@@ -25883,18 +25963,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 42959, 43036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(986),
+            id: DeclarationId(989),
             name: Some("signed_int_diagnostic_order".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1078),
+                    value: DeclarationId(1081),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1985)),
+            meta_tag: Some(DeclarationId(1989)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -25909,18 +25989,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1200, 1304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(987),
+            id: DeclarationId(990),
             name: Some("unsigned_int_diagnostic_order".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1078),
+                    value: DeclarationId(1081),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1986)),
+            meta_tag: Some(DeclarationId(1990)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -25935,7 +26015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1378, 1489),
         });
         declarations.push(Declaration {
-            id: DeclarationId(988),
+            id: DeclarationId(991),
             name: Some("Lens".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -25945,27 +26025,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(1988),
+                        ty: DeclarationId(1992),
                     },
                     Field {
                         label: "sequential".to_string(),
-                        ty: DeclarationId(1989),
+                        ty: DeclarationId(1993),
                     },
                     Field {
                         label: "branch".to_string(),
-                        ty: DeclarationId(1990),
+                        ty: DeclarationId(1994),
                     },
                     Field {
                         label: "iterate".to_string(),
-                        ty: DeclarationId(1991),
+                        ty: DeclarationId(1995),
                     },
                     Field {
                         label: "validate".to_string(),
-                        ty: DeclarationId(1992),
+                        ty: DeclarationId(1996),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(989)],
+            type_params: vec![DeclarationId(992)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -25976,7 +26056,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(989),
+            id: DeclarationId(992),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("C".to_string())),
             type_params: vec![],
@@ -25990,21 +26070,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(990),
+            id: DeclarationId(993),
             name: Some("Lookup".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Miss".to_string(),
-                        ty: DeclarationId(1995),
+                        ty: DeclarationId(1999),
                     },
                     Field {
                         label: "Hit".to_string(),
-                        ty: DeclarationId(1996),
+                        ty: DeclarationId(2000),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(991)],
+            type_params: vec![DeclarationId(994)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -26015,7 +26095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4509, 4551),
         });
         declarations.push(Declaration {
-            id: DeclarationId(991),
+            id: DeclarationId(994),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("value".to_string())),
             type_params: vec![],
@@ -26029,11 +26109,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4509, 4551),
         });
         declarations.push(Declaration {
-            id: DeclarationId(992),
+            id: DeclarationId(995),
             name: Some("miss_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1993),
+                output: DeclarationId(1997),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4589, 4599)),
             },
             type_params: vec![],
@@ -26047,11 +26127,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4553, 4599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(993),
+            id: DeclarationId(996),
             name: Some("hit_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(1994),
+                output: DeclarationId(1998),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4642, 4654)),
             },
             type_params: vec![],
@@ -26065,7 +26145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4601, 4654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(994),
+            id: DeclarationId(997),
             name: Some("DagDifference".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -26084,12 +26164,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 684, 723),
         });
         declarations.push(Declaration {
-            id: DeclarationId(995),
+            id: DeclarationId(998),
             name: Some("SurfaceModule".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "items".to_string(),
-                    ty: DeclarationId(1997),
+                    ty: DeclarationId(2001),
                 }],
             },
             type_params: vec![],
@@ -26103,7 +26183,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1149, 1198),
         });
         declarations.push(Declaration {
-            id: DeclarationId(996),
+            id: DeclarationId(999),
             name: Some("SurfaceParam".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -26113,11 +26193,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "ty".to_string(),
-                        ty: DeclarationId(1000),
+                        ty: DeclarationId(1003),
                     },
                     Field {
                         label: "refinement".to_string(),
-                        ty: DeclarationId(1998),
+                        ty: DeclarationId(2002),
                     },
                 ],
             },
@@ -26132,7 +26212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1200, 1281),
         });
         declarations.push(Declaration {
-            id: DeclarationId(997),
+            id: DeclarationId(1000),
             name: Some("SurfaceField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -26142,7 +26222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "ty".to_string(),
-                        ty: DeclarationId(1000),
+                        ty: DeclarationId(1003),
                     },
                 ],
             },
@@ -26157,7 +26237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1283, 1337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(998),
+            id: DeclarationId(1001),
             name: Some("SurfaceVariant".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -26167,7 +26247,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(999),
+                        ty: DeclarationId(1002),
                     },
                     Field {
                         label: "span".to_string(),
@@ -26186,17 +26266,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1339, 1422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(999),
+            id: DeclarationId(1002),
             name: Some("VariantPayload".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Positional".to_string(),
-                        ty: DeclarationId(2000),
+                        ty: DeclarationId(2004),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(2002),
+                        ty: DeclarationId(2006),
                     },
                 ],
             },
@@ -26211,25 +26291,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1712, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1000),
+            id: DeclarationId(1003),
             name: Some("SurfaceType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Named".to_string(),
-                        ty: DeclarationId(2003),
+                        ty: DeclarationId(2007),
                     },
                     Field {
                         label: "Parameterized".to_string(),
-                        ty: DeclarationId(2005),
+                        ty: DeclarationId(2009),
                     },
                     Field {
                         label: "Optional".to_string(),
-                        ty: DeclarationId(2006),
+                        ty: DeclarationId(2010),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2008),
+                        ty: DeclarationId(2012),
                     },
                 ],
             },
@@ -26244,7 +26324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2052, 2379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1001),
+            id: DeclarationId(1004),
             name: Some("SurfaceRecordField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -26254,7 +26334,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(1007),
+                        ty: DeclarationId(1010),
                     },
                     Field {
                         label: "span".to_string(),
@@ -26273,7 +26353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2381, 2463),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1002),
+            id: DeclarationId(1005),
             name: Some("SurfaceMapEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -26287,7 +26367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(1007),
+                        ty: DeclarationId(1010),
                     },
                     Field {
                         label: "span".to_string(),
@@ -26306,17 +26386,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3353, 3454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1003),
+            id: DeclarationId(1006),
             name: Some("SurfaceMatchArm".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "pattern".to_string(),
-                        ty: DeclarationId(1005),
+                        ty: DeclarationId(1008),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(1007),
+                        ty: DeclarationId(1010),
                     },
                     Field {
                         label: "span".to_string(),
@@ -26335,7 +26415,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3456, 3545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1004),
+            id: DeclarationId(1007),
             name: Some("SurfacePatternField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -26364,21 +26444,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3547, 3627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1005),
+            id: DeclarationId(1008),
             name: Some("SurfacePattern".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BareVariant".to_string(),
-                        ty: DeclarationId(2009),
+                        ty: DeclarationId(2013),
                     },
                     Field {
                         label: "VariantWith".to_string(),
-                        ty: DeclarationId(2010),
+                        ty: DeclarationId(2014),
                     },
                     Field {
                         label: "VariantFields".to_string(),
-                        ty: DeclarationId(2012),
+                        ty: DeclarationId(2016),
                     },
                 ],
             },
@@ -26393,21 +26473,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3725, 3991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1006),
+            id: DeclarationId(1009),
             name: Some("SurfaceLiteral".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Int".to_string(),
-                        ty: DeclarationId(2013),
+                        ty: DeclarationId(2017),
                     },
                     Field {
                         label: "Bool".to_string(),
-                        ty: DeclarationId(2014),
+                        ty: DeclarationId(2018),
                     },
                     Field {
                         label: "String".to_string(),
-                        ty: DeclarationId(2015),
+                        ty: DeclarationId(2019),
                     },
                 ],
             },
@@ -26422,57 +26502,57 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4554, 4620),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1007),
+            id: DeclarationId(1010),
             name: Some("SurfaceExpr".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(2016),
+                        ty: DeclarationId(2020),
                     },
                     Field {
                         label: "Var".to_string(),
-                        ty: DeclarationId(2017),
+                        ty: DeclarationId(2021),
                     },
                     Field {
                         label: "Path".to_string(),
-                        ty: DeclarationId(2020),
+                        ty: DeclarationId(2024),
                     },
                     Field {
                         label: "Call".to_string(),
-                        ty: DeclarationId(2022),
+                        ty: DeclarationId(2026),
                     },
                     Field {
                         label: "VariantRecord".to_string(),
-                        ty: DeclarationId(2024),
+                        ty: DeclarationId(2028),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(2026),
+                        ty: DeclarationId(2030),
                     },
                     Field {
                         label: "Lambda".to_string(),
-                        ty: DeclarationId(2028),
+                        ty: DeclarationId(2032),
                     },
                     Field {
                         label: "If".to_string(),
-                        ty: DeclarationId(2029),
+                        ty: DeclarationId(2033),
                     },
                     Field {
                         label: "Match".to_string(),
-                        ty: DeclarationId(2031),
+                        ty: DeclarationId(2035),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(2033),
+                        ty: DeclarationId(2037),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(2035),
+                        ty: DeclarationId(2039),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(2037),
+                        ty: DeclarationId(2041),
                     },
                 ],
             },
@@ -26487,49 +26567,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4713, 7852),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1008),
+            id: DeclarationId(1011),
             name: Some("SurfaceItem".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Let".to_string(),
-                        ty: DeclarationId(2039),
+                        ty: DeclarationId(2043),
                     },
                     Field {
                         label: "Fn".to_string(),
-                        ty: DeclarationId(2042),
+                        ty: DeclarationId(2046),
                     },
                     Field {
                         label: "FnExternalBody".to_string(),
-                        ty: DeclarationId(2045),
+                        ty: DeclarationId(2049),
                     },
                     Field {
                         label: "Data".to_string(),
-                        ty: DeclarationId(2047),
+                        ty: DeclarationId(2051),
                     },
                     Field {
                         label: "Module".to_string(),
-                        ty: DeclarationId(2049),
+                        ty: DeclarationId(2053),
                     },
                     Field {
                         label: "Import".to_string(),
-                        ty: DeclarationId(2052),
+                        ty: DeclarationId(2056),
                     },
                     Field {
                         label: "TypeAtom".to_string(),
-                        ty: DeclarationId(2054),
+                        ty: DeclarationId(2058),
                     },
                     Field {
                         label: "TypeRecord".to_string(),
-                        ty: DeclarationId(2057),
+                        ty: DeclarationId(2061),
                     },
                     Field {
                         label: "TypeSum".to_string(),
-                        ty: DeclarationId(2061),
+                        ty: DeclarationId(2065),
                     },
                     Field {
                         label: "TypeAlias".to_string(),
-                        ty: DeclarationId(2064),
+                        ty: DeclarationId(2068),
                     },
                 ],
             },
@@ -26544,18 +26624,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8721, 10039),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1009),
+            id: DeclarationId(1012),
             name: Some("python_method_template_contracts".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(928),
+                    value: DeclarationId(931),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2065)),
+            meta_tag: Some(DeclarationId(2069)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -26574,7 +26654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -26587,7 +26667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -26607,7 +26687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg}.join({recv})".to_string(),
                             ))],
@@ -26620,7 +26700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -26640,7 +26720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}.split({arg})".to_string(),
                             ))],
@@ -26653,7 +26733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -26675,7 +26755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[-1] if {recv} else None".to_string(),
                             ))],
@@ -26688,7 +26768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -26710,7 +26790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[0] if {recv} else None".to_string(),
                             ))],
@@ -26723,7 +26803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -26745,7 +26825,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "list(enumerate({recv}))".to_string(),
                             ))],
@@ -26758,7 +26838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -26780,7 +26860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[ord(c) for c in {recv}]".to_string(),
                             ))],
@@ -26793,7 +26873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -26813,7 +26893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv} + {arg}".to_string(),
                             ))],
@@ -26826,7 +26906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -26848,7 +26928,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[{arg}(x) for x in {recv}]".to_string(),
                             ))],
@@ -26861,7 +26941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -26883,7 +26963,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[x for x in {recv} if {arg}(x)]".to_string(),
                             ))],
@@ -26896,7 +26976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -26918,7 +26998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "any({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -26931,7 +27011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -26953,7 +27033,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "all({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -26966,7 +27046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -26988,7 +27068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[y for x in {recv} for y in {arg}(x)]".to_string(),
                             ))],
@@ -27001,7 +27081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -27021,7 +27101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -27034,7 +27114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -27054,7 +27134,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -27067,7 +27147,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -27089,7 +27169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "functools.reduce({arg}, {recv})".to_string(),
                             ))],
@@ -27102,7 +27182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -27124,7 +27204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "sorted({recv}, key={arg})".to_string(),
                             ))],
@@ -27137,7 +27217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -27157,7 +27237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1946),
+                            constructor: DeclarationId(1950),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv} + [{arg}]".to_string(),
                             ))],
@@ -27170,7 +27250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -27185,7 +27265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1010),
+            id: DeclarationId(1013),
             name: Some("ResourceHandle".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -27218,12 +27298,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/resources.dag", 739, 827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1011),
+            id: DeclarationId(1014),
             name: Some("ResourceReference".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "target".to_string(),
-                    ty: DeclarationId(1078),
+                    ty: DeclarationId(1081),
                 }],
             },
             type_params: vec![],
@@ -27237,7 +27317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/resources.dag", 829, 880),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1012),
+            id: DeclarationId(1015),
             name: Some("NamedField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -27247,7 +27327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(1013),
+                        ty: DeclarationId(1016),
                     },
                 ],
             },
@@ -27262,29 +27342,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 755, 805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1013),
+            id: DeclarationId(1016),
             name: Some("Value".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LiteralValue".to_string(),
-                        ty: DeclarationId(2066),
+                        ty: DeclarationId(2070),
                     },
                     Field {
                         label: "RecordValue".to_string(),
-                        ty: DeclarationId(2068),
+                        ty: DeclarationId(2072),
                     },
                     Field {
                         label: "VariantValue".to_string(),
-                        ty: DeclarationId(2069),
+                        ty: DeclarationId(2073),
                     },
                     Field {
                         label: "NodeRef".to_string(),
-                        ty: DeclarationId(2070),
+                        ty: DeclarationId(2074),
                     },
                     Field {
                         label: "CardinalityValue".to_string(),
-                        ty: DeclarationId(2071),
+                        ty: DeclarationId(2075),
                     },
                 ],
             },
@@ -27299,15 +27379,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2117, 2299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1014),
+            id: DeclarationId(1017),
             name: Some("ProgramObservation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "observed".to_string(),
-                    ty: DeclarationId(1015),
+                    ty: DeclarationId(1018),
                 }],
             },
-            type_params: vec![DeclarationId(1015)],
+            type_params: vec![DeclarationId(1018)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -27318,7 +27398,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 3203, 3259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1015),
+            id: DeclarationId(1018),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -27332,12 +27412,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 3203, 3259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1016),
+            id: DeclarationId(1019),
             name: Some("EvalFrame".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bindings".to_string(),
-                    ty: DeclarationId(2072),
+                    ty: DeclarationId(2076),
                 }],
             },
             type_params: vec![],
@@ -27351,12 +27431,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 3902, 3951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1017),
+            id: DeclarationId(1020),
             name: Some("EvalStateStack".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "frames".to_string(),
-                    ty: DeclarationId(2073),
+                    ty: DeclarationId(2077),
                 }],
             },
             type_params: vec![],
@@ -27370,12 +27450,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 4548, 4597),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1018),
+            id: DeclarationId(1021),
             name: Some("EvalStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "ApplicativeOrder".to_string(),
-                    ty: DeclarationId(2074),
+                    ty: DeclarationId(2078),
                 }],
             },
             type_params: vec![],
@@ -27389,12 +27469,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5002, 5076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1019),
+            id: DeclarationId(1022),
             name: Some("InputEvaluationOrder".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LeftFirst".to_string(),
-                    ty: DeclarationId(2075),
+                    ty: DeclarationId(2079),
                 }],
             },
             type_params: vec![],
@@ -27407,9 +27487,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/runtime.dag", 5313, 5350),
         });
-        declarations.push(Declaration { id: DeclarationId(1020), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(928) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2076)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(237)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(261)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(239)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1947), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1947), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1947), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1947), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(259)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) });
+        declarations.push(Declaration { id: DeclarationId(1023), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(931) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2080)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(237)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(261)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(239)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(259)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) });
         declarations.push(Declaration {
-            id: DeclarationId(1021),
+            id: DeclarationId(1024),
             name: Some("InputField".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -27423,7 +27503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/services.dag", 3686, 3704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1022),
+            id: DeclarationId(1025),
             name: Some("RestEndpointBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -27448,12 +27528,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/services.dag", 4653, 4725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1023),
+            id: DeclarationId(1026),
             name: Some("CallableRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1078),
+                    ty: DeclarationId(1081),
                 }],
             },
             type_params: vec![],
@@ -27467,21 +27547,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/services.dag", 5533, 5576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1024),
+            id: DeclarationId(1027),
             name: Some("Operation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "callable".to_string(),
-                        ty: DeclarationId(1023),
+                        ty: DeclarationId(1026),
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2077),
+                        ty: DeclarationId(2081),
                     },
                     Field {
                         label: "endpoint".to_string(),
-                        ty: DeclarationId(1022),
+                        ty: DeclarationId(1025),
                     },
                 ],
             },
@@ -27496,21 +27576,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/services.dag", 6785, 6895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1025),
+            id: DeclarationId(1028),
             name: Some("DescentEvidence".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Strict".to_string(),
-                        ty: DeclarationId(2085),
+                        ty: DeclarationId(2089),
                     },
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2086),
+                        ty: DeclarationId(2090),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2087),
+                        ty: DeclarationId(2091),
                     },
                 ],
             },
@@ -27525,10 +27605,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 642, 710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1026),
+            id: DeclarationId(1029),
             name: Some("evidence_rank".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1025)],
+                inputs: vec![DeclarationId(1028)],
                 output: DeclarationId(81),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 756, 838)),
             },
@@ -27543,11 +27623,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 712, 838),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1027),
+            id: DeclarationId(1030),
             name: Some("merge_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1025), DeclarationId(1025)],
-                output: DeclarationId(1025),
+                inputs: vec![DeclarationId(1028), DeclarationId(1028)],
+                output: DeclarationId(1028),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 982, 1310)),
             },
             type_params: vec![],
@@ -27561,11 +27641,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 905, 1310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1028),
+            id: DeclarationId(1031),
             name: Some("join_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1025), DeclarationId(1025)],
-                output: DeclarationId(1025),
+                inputs: vec![DeclarationId(1028), DeclarationId(1028)],
+                output: DeclarationId(1028),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     1456,
@@ -27583,11 +27663,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 1380, 1655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1029),
+            id: DeclarationId(1032),
             name: Some("promote_to_strict".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1025)],
-                output: DeclarationId(1025),
+                inputs: vec![DeclarationId(1028)],
+                output: DeclarationId(1028),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2117,
@@ -27605,11 +27685,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2050, 2236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1030),
+            id: DeclarationId(1033),
             name: Some("optional_evidence_meet".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2078), DeclarationId(2079)],
-                output: DeclarationId(2080),
+                inputs: vec![DeclarationId(2082), DeclarationId(2083)],
+                output: DeclarationId(2084),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2388,
@@ -27627,11 +27707,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2300, 2564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1031),
+            id: DeclarationId(1034),
             name: Some("map_evidence_merge_at".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2081), DeclarationId(197), DeclarationId(1025)],
-                output: DeclarationId(2082),
+                inputs: vec![DeclarationId(2085), DeclarationId(197), DeclarationId(1028)],
+                output: DeclarationId(2086),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2733,
@@ -27649,29 +27729,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2601, 2907),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1032),
+            id: DeclarationId(1035),
             name: Some("RankingDimension".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2088),
+                        ty: DeclarationId(2092),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2089),
+                        ty: DeclarationId(2093),
                     },
                     Field {
                         label: "ArithmeticValue".to_string(),
-                        ty: DeclarationId(2090),
+                        ty: DeclarationId(2094),
                     },
                     Field {
                         label: "TokenPosition".to_string(),
-                        ty: DeclarationId(2091),
+                        ty: DeclarationId(2095),
                     },
                     Field {
                         label: "SetCardinality".to_string(),
-                        ty: DeclarationId(2092),
+                        ty: DeclarationId(2096),
                     },
                 ],
             },
@@ -27686,17 +27766,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3206, 3402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1033),
+            id: DeclarationId(1036),
             name: Some("PositiveDescentAmount".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OneStep".to_string(),
-                        ty: DeclarationId(2093),
+                        ty: DeclarationId(2097),
                     },
                     Field {
                         label: "AdditionalStep".to_string(),
-                        ty: DeclarationId(2094),
+                        ty: DeclarationId(2098),
                     },
                 ],
             },
@@ -27711,17 +27791,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4378, 4471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1034),
+            id: DeclarationId(1037),
             name: Some("ProportionalDivisor".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DivideByTwo".to_string(),
-                        ty: DeclarationId(2095),
+                        ty: DeclarationId(2099),
                     },
                     Field {
                         label: "StrictlyLarger".to_string(),
-                        ty: DeclarationId(2096),
+                        ty: DeclarationId(2100),
                     },
                 ],
             },
@@ -27736,10 +27816,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4937, 5027),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1035),
+            id: DeclarationId(1038),
             name: Some("proportional_divisor_to_int".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1034)],
+                inputs: vec![DeclarationId(1037)],
                 output: DeclarationId(81),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
@@ -27758,7 +27838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5029, 5204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1036),
+            id: DeclarationId(1039),
             name: Some("peano_literal_materialization_cap".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
@@ -27780,11 +27860,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5388, 5441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1037),
+            id: DeclarationId(1040),
             name: Some("positive_descent_amount_from_positive_int".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2083),
+                output: DeclarationId(2087),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     5902,
@@ -27802,11 +27882,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5823, 6262),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1038),
+            id: DeclarationId(1041),
             name: Some("proportional_divisor_from_int_at_least_two".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2084),
+                output: DeclarationId(2088),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6342,
@@ -27824,37 +27904,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6264, 6703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1039),
+            id: DeclarationId(1042),
             name: Some("DescentSource".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ChildAccessor".to_string(),
-                        ty: DeclarationId(2097),
+                        ty: DeclarationId(2101),
                     },
                     Field {
                         label: "ListShrink".to_string(),
-                        ty: DeclarationId(2098),
+                        ty: DeclarationId(2102),
                     },
                     Field {
                         label: "ArithmeticSubtractDescent".to_string(),
-                        ty: DeclarationId(2099),
+                        ty: DeclarationId(2103),
                     },
                     Field {
                         label: "ArithmeticDivideDescent".to_string(),
-                        ty: DeclarationId(2100),
+                        ty: DeclarationId(2104),
                     },
                     Field {
                         label: "ParserAdvance".to_string(),
-                        ty: DeclarationId(2101),
+                        ty: DeclarationId(2105),
                     },
                     Field {
                         label: "SetRemoval".to_string(),
-                        ty: DeclarationId(2102),
+                        ty: DeclarationId(2106),
                     },
                     Field {
                         label: "FoldIteration".to_string(),
-                        ty: DeclarationId(2103),
+                        ty: DeclarationId(2107),
                     },
                 ],
             },
@@ -27869,12 +27949,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7108, 7429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1040),
+            id: DeclarationId(1043),
             name: Some("TerminationProof".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "dimensions".to_string(),
-                    ty: DeclarationId(2104),
+                    ty: DeclarationId(2108),
                 }],
             },
             type_params: vec![],
@@ -27888,7 +27968,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7431, 7493),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1041),
+            id: DeclarationId(1044),
             name: Some("ProofEdge".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -27902,7 +27982,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(2105),
+                        ty: DeclarationId(2109),
                     },
                 ],
             },
@@ -27917,193 +27997,193 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7638, 7724),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1042),
+            id: DeclarationId(1045),
             name: Some("TokenKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2106),
+                        ty: DeclarationId(2110),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2107),
+                        ty: DeclarationId(2111),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2108),
+                        ty: DeclarationId(2112),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2109),
+                        ty: DeclarationId(2113),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2110),
+                        ty: DeclarationId(2114),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2111),
+                        ty: DeclarationId(2115),
                     },
                     Field {
                         label: "KwService".to_string(),
-                        ty: DeclarationId(2112),
+                        ty: DeclarationId(2116),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2113),
+                        ty: DeclarationId(2117),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2114),
+                        ty: DeclarationId(2118),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2115),
+                        ty: DeclarationId(2119),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2116),
+                        ty: DeclarationId(2120),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2117),
+                        ty: DeclarationId(2121),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2118),
+                        ty: DeclarationId(2122),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2119),
+                        ty: DeclarationId(2123),
                     },
                     Field {
                         label: "Ident".to_string(),
-                        ty: DeclarationId(2120),
+                        ty: DeclarationId(2124),
                     },
                     Field {
                         label: "IntLit".to_string(),
-                        ty: DeclarationId(2121),
+                        ty: DeclarationId(2125),
                     },
                     Field {
                         label: "StringLit".to_string(),
-                        ty: DeclarationId(2122),
+                        ty: DeclarationId(2126),
                     },
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2123),
+                        ty: DeclarationId(2127),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2124),
+                        ty: DeclarationId(2128),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2125),
+                        ty: DeclarationId(2129),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2126),
+                        ty: DeclarationId(2130),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2127),
+                        ty: DeclarationId(2131),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2128),
+                        ty: DeclarationId(2132),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2129),
+                        ty: DeclarationId(2133),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2130),
+                        ty: DeclarationId(2134),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2131),
+                        ty: DeclarationId(2135),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2132),
+                        ty: DeclarationId(2136),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2133),
+                        ty: DeclarationId(2137),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2134),
+                        ty: DeclarationId(2138),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2135),
+                        ty: DeclarationId(2139),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2136),
+                        ty: DeclarationId(2140),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2137),
+                        ty: DeclarationId(2141),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2138),
+                        ty: DeclarationId(2142),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2139),
+                        ty: DeclarationId(2143),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2140),
+                        ty: DeclarationId(2144),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2141),
+                        ty: DeclarationId(2145),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2142),
+                        ty: DeclarationId(2146),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2143),
+                        ty: DeclarationId(2147),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2144),
+                        ty: DeclarationId(2148),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2145),
+                        ty: DeclarationId(2149),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2146),
+                        ty: DeclarationId(2150),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2147),
+                        ty: DeclarationId(2151),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2148),
+                        ty: DeclarationId(2152),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2149),
+                        ty: DeclarationId(2153),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2150),
+                        ty: DeclarationId(2154),
                     },
                     Field {
                         label: "Eof".to_string(),
-                        ty: DeclarationId(2151),
+                        ty: DeclarationId(2155),
                     },
                 ],
             },
@@ -28118,13 +28198,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 627, 1151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1043),
+            id: DeclarationId(1046),
             name: Some("Token".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1042),
+                        ty: DeclarationId(1045),
                     },
                     Field {
                         label: "span".to_string(),
@@ -28143,65 +28223,65 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1286, 1337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1044),
+            id: DeclarationId(1047),
             name: Some("KeywordTokenKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2152),
+                        ty: DeclarationId(2156),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2153),
+                        ty: DeclarationId(2157),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2154),
+                        ty: DeclarationId(2158),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2155),
+                        ty: DeclarationId(2159),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2156),
+                        ty: DeclarationId(2160),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2157),
+                        ty: DeclarationId(2161),
                     },
                     Field {
                         label: "KwService".to_string(),
-                        ty: DeclarationId(2158),
+                        ty: DeclarationId(2162),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2159),
+                        ty: DeclarationId(2163),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2160),
+                        ty: DeclarationId(2164),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2161),
+                        ty: DeclarationId(2165),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2162),
+                        ty: DeclarationId(2166),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2163),
+                        ty: DeclarationId(2167),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2164),
+                        ty: DeclarationId(2168),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2165),
+                        ty: DeclarationId(2169),
                     },
                 ],
             },
@@ -28216,121 +28296,121 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1696, 1876),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1045),
+            id: DeclarationId(1048),
             name: Some("PunctTokenKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2166),
+                        ty: DeclarationId(2170),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2167),
+                        ty: DeclarationId(2171),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2168),
+                        ty: DeclarationId(2172),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2169),
+                        ty: DeclarationId(2173),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2170),
+                        ty: DeclarationId(2174),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2171),
+                        ty: DeclarationId(2175),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2172),
+                        ty: DeclarationId(2176),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2173),
+                        ty: DeclarationId(2177),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2174),
+                        ty: DeclarationId(2178),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2175),
+                        ty: DeclarationId(2179),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2176),
+                        ty: DeclarationId(2180),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2177),
+                        ty: DeclarationId(2181),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2178),
+                        ty: DeclarationId(2182),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2179),
+                        ty: DeclarationId(2183),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2180),
+                        ty: DeclarationId(2184),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2181),
+                        ty: DeclarationId(2185),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2182),
+                        ty: DeclarationId(2186),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2183),
+                        ty: DeclarationId(2187),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2184),
+                        ty: DeclarationId(2188),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2185),
+                        ty: DeclarationId(2189),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2186),
+                        ty: DeclarationId(2190),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2187),
+                        ty: DeclarationId(2191),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2188),
+                        ty: DeclarationId(2192),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2189),
+                        ty: DeclarationId(2193),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2190),
+                        ty: DeclarationId(2194),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2191),
+                        ty: DeclarationId(2195),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2192),
+                        ty: DeclarationId(2196),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2193),
+                        ty: DeclarationId(2197),
                     },
                 ],
             },
@@ -28345,7 +28425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2292, 2598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1046),
+            id: DeclarationId(1049),
             name: Some("LocalPunctSpec".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -28355,7 +28435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1045),
+                        ty: DeclarationId(1048),
                     },
                 ],
             },
@@ -28370,7 +28450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2808, 2872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1047),
+            id: DeclarationId(1050),
             name: Some("StringEscapeSpec".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -28395,7 +28475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 3259, 3325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1048),
+            id: DeclarationId(1051),
             name: Some("Path".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(131),
@@ -28412,7 +28492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1340, 1360),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1049),
+            id: DeclarationId(1052),
             name: Some("SnapshotRef".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(122),
@@ -28429,7 +28509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1361, 1391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1050),
+            id: DeclarationId(1053),
             name: Some("CensusListConstant".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -28443,15 +28523,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1528, 1554),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1051),
+            id: DeclarationId(1054),
             name: Some("expected_hand_authored_non_test".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1050),
+                template: DeclarationId(1053),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1050)),
+            meta_tag: Some(DeclarationId(1053)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -28460,15 +28540,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1556, 1617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1052),
+            id: DeclarationId(1055),
             name: Some("expected_hand_authored_test".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1050),
+                template: DeclarationId(1053),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1050)),
+            meta_tag: Some(DeclarationId(1053)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -28477,7 +28557,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1618, 1675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1053),
+            id: DeclarationId(1056),
             name: Some("LensProducerFilesSubsetPredicate".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -28491,15 +28571,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1807, 1847),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1054),
+            id: DeclarationId(1057),
             name: Some("lens_producer_files_subset_predicate".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1053),
+                template: DeclarationId(1056),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1053)),
+            meta_tag: Some(DeclarationId(1056)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -28508,7 +28588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1849, 1929),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1055),
+            id: DeclarationId(1058),
             name: Some("CompilerStdPositiveSetRatchet".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -28522,15 +28602,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2008, 2045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1056),
+            id: DeclarationId(1059),
             name: Some("compiler_std_positive_set_ratchet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1055),
+                template: DeclarationId(1058),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1055)),
+            meta_tag: Some(DeclarationId(1058)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -28539,37 +28619,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2047, 2121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1057),
+            id: DeclarationId(1060),
             name: Some("DiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2197),
+                        ty: DeclarationId(2201),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2198),
+                        ty: DeclarationId(2202),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2199),
+                        ty: DeclarationId(2203),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2200),
+                        ty: DeclarationId(2204),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2201),
+                        ty: DeclarationId(2205),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(2202),
+                        ty: DeclarationId(2206),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2203),
+                        ty: DeclarationId(2207),
                     },
                 ],
             },
@@ -28584,17 +28664,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2456, 2606),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1058),
+            id: DeclarationId(1061),
             name: Some("DiagnosticDetailExpectation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AnyDetail".to_string(),
-                        ty: DeclarationId(2204),
+                        ty: DeclarationId(2208),
                     },
                     Field {
                         label: "Contains".to_string(),
-                        ty: DeclarationId(2205),
+                        ty: DeclarationId(2209),
                     },
                 ],
             },
@@ -28609,17 +28689,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2975, 3042),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1059),
+            id: DeclarationId(1062),
             name: Some("DiagnosticReference".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1057),
+                        ty: DeclarationId(1060),
                     },
                     Field {
                         label: "detail_contains".to_string(),
-                        ty: DeclarationId(1058),
+                        ty: DeclarationId(1061),
                     },
                 ],
             },
@@ -28634,17 +28714,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3186, 3284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1060),
+            id: DeclarationId(1063),
             name: Some("PortStateExpectation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(2206),
+                        ty: DeclarationId(2210),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(2207),
+                        ty: DeclarationId(2211),
                     },
                 ],
             },
@@ -28659,21 +28739,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3671, 3724),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1061),
+            id: DeclarationId(1064),
             name: Some("AlgebraicLawKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Associativity".to_string(),
-                        ty: DeclarationId(2208),
+                        ty: DeclarationId(2212),
                     },
                     Field {
                         label: "Commutativity".to_string(),
-                        ty: DeclarationId(2209),
+                        ty: DeclarationId(2213),
                     },
                     Field {
                         label: "Identity".to_string(),
-                        ty: DeclarationId(2210),
+                        ty: DeclarationId(2214),
                     },
                 ],
             },
@@ -28688,97 +28768,97 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4513, 4583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1062),
+            id: DeclarationId(1065),
             name: Some("TestPredicate".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Compiles".to_string(),
-                        ty: DeclarationId(2211),
+                        ty: DeclarationId(2215),
                     },
                     Field {
                         label: "FailsWithDiagnostic".to_string(),
-                        ty: DeclarationId(2212),
+                        ty: DeclarationId(2216),
                     },
                     Field {
                         label: "OutputEquals".to_string(),
-                        ty: DeclarationId(2213),
+                        ty: DeclarationId(2217),
                     },
                     Field {
                         label: "PortHasState".to_string(),
-                        ty: DeclarationId(2214),
+                        ty: DeclarationId(2218),
                     },
                     Field {
                         label: "DeclarationHasRefinement".to_string(),
-                        ty: DeclarationId(2215),
+                        ty: DeclarationId(2219),
                     },
                     Field {
                         label: "CostBounded".to_string(),
-                        ty: DeclarationId(2216),
+                        ty: DeclarationId(2220),
                     },
                     Field {
                         label: "BehavioralObservation".to_string(),
-                        ty: DeclarationId(2217),
+                        ty: DeclarationId(2221),
                     },
                     Field {
                         label: "MockBackedInvariant".to_string(),
-                        ty: DeclarationId(2218),
+                        ty: DeclarationId(2222),
                     },
                     Field {
                         label: "ExecuteCommand".to_string(),
-                        ty: DeclarationId(2220),
+                        ty: DeclarationId(2224),
                     },
                     Field {
                         label: "ForAllTargets".to_string(),
-                        ty: DeclarationId(2222),
+                        ty: DeclarationId(2226),
                     },
                     Field {
                         label: "LensOutputEquals".to_string(),
-                        ty: DeclarationId(2223),
+                        ty: DeclarationId(2227),
                     },
                     Field {
                         label: "DifferentialEquals".to_string(),
-                        ty: DeclarationId(2224),
+                        ty: DeclarationId(2228),
                     },
                     Field {
                         label: "BinaryDimensionReportEquals".to_string(),
-                        ty: DeclarationId(2225),
+                        ty: DeclarationId(2229),
                     },
                     Field {
                         label: "AlgebraicLaw".to_string(),
-                        ty: DeclarationId(2226),
+                        ty: DeclarationId(2230),
                     },
                     Field {
                         label: "CensusBoundCheck".to_string(),
-                        ty: DeclarationId(2227),
+                        ty: DeclarationId(2231),
                     },
                     Field {
                         label: "CensusSubsetCount".to_string(),
-                        ty: DeclarationId(2228),
+                        ty: DeclarationId(2232),
                     },
                     Field {
                         label: "FixedPointConverges".to_string(),
-                        ty: DeclarationId(2229),
+                        ty: DeclarationId(2233),
                     },
                     Field {
                         label: "RatchetZero".to_string(),
-                        ty: DeclarationId(2230),
+                        ty: DeclarationId(2234),
                     },
                     Field {
                         label: "GeneratedFromDag".to_string(),
-                        ty: DeclarationId(2232),
+                        ty: DeclarationId(2236),
                     },
                     Field {
                         label: "ReleaseDeferredClaim".to_string(),
-                        ty: DeclarationId(2233),
+                        ty: DeclarationId(2237),
                     },
                     Field {
                         label: "SubstrateResearchDeferredClaim".to_string(),
-                        ty: DeclarationId(2234),
+                        ty: DeclarationId(2238),
                     },
                     Field {
                         label: "BridgeLedgerZero".to_string(),
-                        ty: DeclarationId(2235),
+                        ty: DeclarationId(2239),
                     },
                 ],
             },
@@ -28793,7 +28873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4585, 12806),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1063),
+            id: DeclarationId(1066),
             name: Some("ProgramInput".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -28807,12 +28887,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 12914, 12934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1064),
+            id: DeclarationId(1067),
             name: Some("ProgramOutputBind".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "output_ref".to_string(),
-                    ty: DeclarationId(1078),
+                    ty: DeclarationId(1081),
                 }],
             },
             type_params: vec![],
@@ -28826,7 +28906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 13077, 13132),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1065),
+            id: DeclarationId(1068),
             name: Some("TestClaim".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -28844,11 +28924,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "predicate".to_string(),
-                        ty: DeclarationId(1062),
+                        ty: DeclarationId(1065),
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2236),
+                        ty: DeclarationId(2240),
                     },
                 ],
             },
@@ -28863,7 +28943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 13742, 13875),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1066),
+            id: DeclarationId(1069),
             name: Some("TestSuite".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -28873,7 +28953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "claims".to_string(),
-                        ty: DeclarationId(2237),
+                        ty: DeclarationId(2241),
                     },
                 ],
             },
@@ -28888,7 +28968,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 13877, 13936),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1067),
+            id: DeclarationId(1070),
             name: Some("TestObligation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -28898,7 +28978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "resources".to_string(),
-                        ty: DeclarationId(2238),
+                        ty: DeclarationId(2242),
                     },
                 ],
             },
@@ -28913,11 +28993,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 14134, 14215),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1068),
+            id: DeclarationId(1071),
             name: Some("claim_obligation_resources".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1065)],
-                output: DeclarationId(2194),
+                inputs: vec![DeclarationId(1068)],
+                output: DeclarationId(2198),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     14657,
@@ -28935,11 +29015,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 14586, 14673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1069),
+            id: DeclarationId(1072),
             name: Some("obligation_for_claim".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1065)],
-                output: DeclarationId(1067),
+                inputs: vec![DeclarationId(1068)],
+                output: DeclarationId(1070),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     14731,
@@ -28957,11 +29037,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 14675, 14816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1070),
+            id: DeclarationId(1073),
             name: Some("materialize_test_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2195)],
-                output: DeclarationId(2196),
+                inputs: vec![DeclarationId(2199)],
+                output: DeclarationId(2200),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     14899,
@@ -28979,11 +29059,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 14818, 14938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1071),
+            id: DeclarationId(1074),
             name: Some("behavior_spine".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744)],
-                output: DeclarationId(2239),
+                output: DeclarationId(2243),
                 body: ArrowBody::UserDefined(NodeId(240)),
             },
             type_params: vec![],
@@ -28997,7 +29077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/workflows.dag", 963, 1018),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1072),
+            id: DeclarationId(1075),
             name: Some("ValueBehavior".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -29011,7 +29091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2935, 2956),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1073),
+            id: DeclarationId(1076),
             name: Some("Transform".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -29025,7 +29105,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2957, 2974),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1074),
+            id: DeclarationId(1077),
             name: Some("Branch".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -29039,7 +29119,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2975, 2989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1075),
+            id: DeclarationId(1078),
             name: Some("Loop".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -29053,7 +29133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2990, 3002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1076),
+            id: DeclarationId(1079),
             name: Some("Bind".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -29067,7 +29147,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3003, 3015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1077),
+            id: DeclarationId(1080),
             name: Some("Main".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -29081,7 +29161,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3016, 3028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1078),
+            id: DeclarationId(1081),
             name: Some("DeclarationRef".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -29095,15 +29175,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3761, 3783),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1079),
+            id: DeclarationId(1082),
             name: Some("go_execution_model".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(850),
+                template: DeclarationId(853),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(850)),
+            meta_tag: Some(DeclarationId(853)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -29111,14 +29191,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1855),
+                            constructor: DeclarationId(1859),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1862),
                             payload: vec![],
                         },
                     ),
@@ -29129,22 +29209,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 1630, 1732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1080),
+            id: DeclarationId(1083),
             name: Some("go_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(852),
+                template: DeclarationId(855),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(852)),
+            meta_tag: Some(DeclarationId(855)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "internal".to_string(),
-                        FieldValue::Reference(DeclarationId(853)),
+                        FieldValue::Reference(DeclarationId(856)),
                     ),
                     (
                         "additional_excluded_prefixes".to_string(),
@@ -29159,15 +29239,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 1734, 1884),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1081),
+            id: DeclarationId(1084),
             name: Some("go_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(854),
+                template: DeclarationId(857),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(854)),
+            meta_tag: Some(DeclarationId(857)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -29180,22 +29260,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 1886, 1961),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1082),
+            id: DeclarationId(1085),
             name: Some("go_int".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -29218,22 +29298,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 1963, 2093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1083),
+            id: DeclarationId(1086),
             name: Some("go_int32".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -29256,22 +29336,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2095, 2229),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1084),
+            id: DeclarationId(1087),
             name: Some("go_integer_inhabit_i32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(892),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(892)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -29284,15 +29364,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1914),
+                            constructor: DeclarationId(1918),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1590),
+                                constructor: DeclarationId(1593),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(-2147483648)),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1589),
+                                        constructor: DeclarationId(1592),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1587),
+                                            constructor: DeclarationId(1590),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 4294967295,
                                             ))],
@@ -29304,7 +29384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1083)),
+                        FieldValue::Reference(DeclarationId(1086)),
                     ),
                 ],
             }),
@@ -29313,22 +29393,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2231, 2534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1085),
+            id: DeclarationId(1088),
             name: Some("go_bool".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -29351,22 +29431,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2536, 2667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1086),
+            id: DeclarationId(1089),
             name: Some("go_string".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -29389,22 +29469,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2669, 2806),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1087),
+            id: DeclarationId(1090),
             name: Some("go_node_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -29427,22 +29507,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2808, 2946),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1088),
+            id: DeclarationId(1091),
             name: Some("go_port_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -29465,22 +29545,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2948, 3086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1089),
+            id: DeclarationId(1092),
             name: Some("go_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -29503,22 +29583,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3088, 3247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1090),
+            id: DeclarationId(1093),
             name: Some("go_cluster_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -29541,22 +29621,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3249, 3396),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1091),
+            id: DeclarationId(1094),
             name: Some("go_type_shape".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -29580,7 +29660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1915),
+                                    constructor: DeclarationId(1919),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -29600,22 +29680,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3398, 3639),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1092),
+            id: DeclarationId(1095),
             name: Some("go_port_state".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -29638,22 +29718,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3641, 3789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1093),
+            id: DeclarationId(1096),
             name: Some("go_port".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -29678,7 +29758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -29697,7 +29777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state".to_string(),
                                         ))],
@@ -29718,7 +29798,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -29739,22 +29819,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3791, 4174),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1094),
+            id: DeclarationId(1097),
             name: Some("go_source_span".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -29779,7 +29859,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -29798,7 +29878,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -29817,7 +29897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -29838,22 +29918,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4176, 4570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1095),
+            id: DeclarationId(1098),
             name: Some("go_literal_bits".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -29876,22 +29956,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4572, 4726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1096),
+            id: DeclarationId(1099),
             name: Some("go_atom_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -29914,22 +29994,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4728, 4882),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1097),
+            id: DeclarationId(1100),
             name: Some("go_cardinality_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -29952,22 +30032,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4884, 5053),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1098),
+            id: DeclarationId(1101),
             name: Some("go_interval".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -29990,22 +30070,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5055, 5199),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1099),
+            id: DeclarationId(1102),
             name: Some("go_positive_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -30030,22 +30110,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5201, 5386),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1100),
+            id: DeclarationId(1103),
             name: Some("go_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -30068,22 +30148,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5388, 5548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1101),
+            id: DeclarationId(1104),
             name: Some("go_conj_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -30108,7 +30188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -30127,7 +30207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -30148,22 +30228,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5550, 5852),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1102),
+            id: DeclarationId(1105),
             name: Some("go_template_argument".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -30190,7 +30270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -30209,7 +30289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -30230,22 +30310,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5854, 6191),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1103),
+            id: DeclarationId(1106),
             name: Some("go_phantom_parameter".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -30272,7 +30352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -30291,7 +30371,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -30312,22 +30392,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 6193, 6534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1104),
+            id: DeclarationId(1107),
             name: Some("go_nominal_opacity".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -30353,7 +30433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1915),
+                                    constructor: DeclarationId(1919),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -30373,22 +30453,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 6536, 6808),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1105),
+            id: DeclarationId(1108),
             name: Some("go_field_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -30413,7 +30493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -30432,7 +30512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -30453,22 +30533,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 6810, 7121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1106),
+            id: DeclarationId(1109),
             name: Some("go_non_empty_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -30493,7 +30573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -30512,7 +30592,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -30533,22 +30613,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 7123, 7439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1107),
+            id: DeclarationId(1110),
             name: Some("go_non_singleton_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -30573,7 +30653,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -30592,7 +30672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -30611,7 +30691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -30632,22 +30712,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 7441, 7850),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1108),
+            id: DeclarationId(1111),
             name: Some("go_param_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -30672,7 +30752,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1916),
+                                        constructor: DeclarationId(1920),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -30691,7 +30771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1916),
+                                        constructor: DeclarationId(1920),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -30712,22 +30792,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 7852, 8168),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1109),
+            id: DeclarationId(1112),
             name: Some("go_transform_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -30751,7 +30831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1916),
+                                    constructor: DeclarationId(1920),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -30771,22 +30851,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 8170, 8411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1110),
+            id: DeclarationId(1113),
             name: Some("go_member_descent".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -30810,7 +30890,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1915),
+                                    constructor: DeclarationId(1919),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -30830,22 +30910,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 8413, 8654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1111),
+            id: DeclarationId(1114),
             name: Some("go_intra_cluster_call".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -30869,7 +30949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1915),
+                                    constructor: DeclarationId(1919),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -30889,22 +30969,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 8656, 8915),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1112),
+            id: DeclarationId(1115),
             name: Some("go_cluster".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -30929,7 +31009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -30950,7 +31030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -30971,22 +31051,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 8917, 9250),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1113),
+            id: DeclarationId(1116),
             name: Some("go_field_value".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -31009,22 +31089,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9252, 9403),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1114),
+            id: DeclarationId(1117),
             name: Some("go_value_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -31047,22 +31127,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9405, 9553),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1115),
+            id: DeclarationId(1118),
             name: Some("go_arrow_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -31085,22 +31165,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9555, 9703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1116),
+            id: DeclarationId(1119),
             name: Some("go_type_connective".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -31123,22 +31203,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9705, 9868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1117),
+            id: DeclarationId(1120),
             name: Some("go_declaration".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -31163,7 +31243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -31182,7 +31262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -31203,7 +31283,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -31224,7 +31304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -31245,7 +31325,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -31266,7 +31346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -31287,7 +31367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -31308,7 +31388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -31329,7 +31409,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -31348,7 +31428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -31369,22 +31449,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9870, 10887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1118),
+            id: DeclarationId(1121),
             name: Some("go_arithmetic_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -31407,22 +31487,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 10889, 11046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1119),
+            id: DeclarationId(1122),
             name: Some("go_comparison_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -31445,22 +31525,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 11048, 11205),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1120),
+            id: DeclarationId(1123),
             name: Some("go_logical_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -31483,22 +31563,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 11207, 11355),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1121),
+            id: DeclarationId(1124),
             name: Some("go_operator_kind".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -31521,22 +31601,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 11357, 11514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1122),
+            id: DeclarationId(1125),
             name: Some("go_transform_target".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -31559,22 +31639,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 11516, 11682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1123),
+            id: DeclarationId(1126),
             name: Some("go_branch_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -31597,22 +31677,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 11684, 11844),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1124),
+            id: DeclarationId(1127),
             name: Some("go_payload_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -31639,7 +31719,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -31660,7 +31740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -31681,22 +31761,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 11846, 12197),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1125),
+            id: DeclarationId(1128),
             name: Some("go_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -31721,7 +31801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -31742,7 +31822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -31761,7 +31841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -31780,7 +31860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -31801,22 +31881,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12199, 12686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1126),
+            id: DeclarationId(1129),
             name: Some("go_loop_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -31839,22 +31919,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12688, 12836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1127),
+            id: DeclarationId(1130),
             name: Some("go_value_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -31879,7 +31959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -31898,7 +31978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -31919,7 +31999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -31938,7 +32018,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -31959,22 +32039,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 13310, 13784),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1128),
+            id: DeclarationId(1131),
             name: Some("go_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -31999,7 +32079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -32018,7 +32098,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -32037,7 +32117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -32058,7 +32138,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -32077,7 +32157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -32098,22 +32178,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 13786, 14351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1129),
+            id: DeclarationId(1132),
             name: Some("go_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -32138,7 +32218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -32157,7 +32237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -32176,7 +32256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -32197,7 +32277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -32216,7 +32296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -32237,7 +32317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -32258,22 +32338,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 14353, 15010),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1130),
+            id: DeclarationId(1133),
             name: Some("go_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -32298,7 +32378,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -32317,7 +32397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -32336,7 +32416,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -32355,7 +32435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -32374,7 +32454,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -32395,7 +32475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -32414,7 +32494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -32435,22 +32515,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 15012, 15714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1131),
+            id: DeclarationId(1134),
             name: Some("go_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -32475,7 +32555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -32494,7 +32574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -32515,7 +32595,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -32534,7 +32614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -32553,7 +32633,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -32574,7 +32654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -32595,22 +32675,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 15716, 16367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1132),
+            id: DeclarationId(1135),
             name: Some("go_behavior".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -32633,22 +32713,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 16369, 16513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1133),
+            id: DeclarationId(1136),
             name: Some("go_dag".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -32675,7 +32755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -32694,7 +32774,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -32713,7 +32793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -32734,7 +32814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -32755,26 +32835,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 16515, 16982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1134),
+            id: DeclarationId(1137),
             name: Some("go_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(995)),
+                        FieldValue::Reference(DeclarationId(998)),
                     ),
                     (
                         "carrier".to_string(),
@@ -32794,7 +32874,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1915),
+                                    constructor: DeclarationId(1919),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -32814,26 +32894,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 17285, 17526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1135),
+            id: DeclarationId(1138),
             name: Some("go_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1008)),
+                        FieldValue::Reference(DeclarationId(1011)),
                     ),
                     (
                         "carrier".to_string(),
@@ -32852,26 +32932,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 17528, 17682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1136),
+            id: DeclarationId(1139),
             name: Some("go_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(996)),
+                        FieldValue::Reference(DeclarationId(999)),
                     ),
                     (
                         "carrier".to_string(),
@@ -32892,7 +32972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -32911,7 +32991,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -32932,7 +33012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -32953,26 +33033,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 17684, 18082),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1137),
+            id: DeclarationId(1140),
             name: Some("go_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(997)),
+                        FieldValue::Reference(DeclarationId(1000)),
                     ),
                     (
                         "carrier".to_string(),
@@ -32993,7 +33073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -33012,7 +33092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -33033,26 +33113,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 18084, 18393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1138),
+            id: DeclarationId(1141),
             name: Some("go_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(998)),
+                        FieldValue::Reference(DeclarationId(1001)),
                     ),
                     (
                         "carrier".to_string(),
@@ -33073,7 +33153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -33092,7 +33172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -33111,7 +33191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33132,26 +33212,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 18395, 18797),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1139),
+            id: DeclarationId(1142),
             name: Some("go_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(999)),
+                        FieldValue::Reference(DeclarationId(1002)),
                     ),
                     (
                         "carrier".to_string(),
@@ -33170,26 +33250,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 18799, 18962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1140),
+            id: DeclarationId(1143),
             name: Some("go_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1000)),
+                        FieldValue::Reference(DeclarationId(1003)),
                     ),
                     (
                         "carrier".to_string(),
@@ -33208,26 +33288,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 18964, 19118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1141),
+            id: DeclarationId(1144),
             name: Some("go_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1001)),
+                        FieldValue::Reference(DeclarationId(1004)),
                     ),
                     (
                         "carrier".to_string(),
@@ -33248,7 +33328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -33267,7 +33347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -33286,7 +33366,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33307,26 +33387,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 19120, 19531),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1142),
+            id: DeclarationId(1145),
             name: Some("go_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1002)),
+                        FieldValue::Reference(DeclarationId(1005)),
                     ),
                     (
                         "carrier".to_string(),
@@ -33347,7 +33427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -33368,7 +33448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -33387,7 +33467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -33406,7 +33486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33427,26 +33507,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 19533, 20018),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1143),
+            id: DeclarationId(1146),
             name: Some("go_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1003)),
+                        FieldValue::Reference(DeclarationId(1006)),
                     ),
                     (
                         "carrier".to_string(),
@@ -33467,7 +33547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -33486,7 +33566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -33505,7 +33585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33526,26 +33606,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 20020, 20426),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1144),
+            id: DeclarationId(1147),
             name: Some("go_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1004)),
+                        FieldValue::Reference(DeclarationId(1007)),
                     ),
                     (
                         "carrier".to_string(),
@@ -33566,7 +33646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -33585,7 +33665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -33604,7 +33684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33625,26 +33705,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 20428, 20846),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1145),
+            id: DeclarationId(1148),
             name: Some("go_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1005)),
+                        FieldValue::Reference(DeclarationId(1008)),
                     ),
                     (
                         "carrier".to_string(),
@@ -33663,26 +33743,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 20848, 21011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1146),
+            id: DeclarationId(1149),
             name: Some("go_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1006)),
+                        FieldValue::Reference(DeclarationId(1009)),
                     ),
                     (
                         "carrier".to_string(),
@@ -33701,26 +33781,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 21013, 21176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1147),
+            id: DeclarationId(1150),
             name: Some("go_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1007)),
+                        FieldValue::Reference(DeclarationId(1010)),
                     ),
                     (
                         "carrier".to_string(),
@@ -33739,22 +33819,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 21178, 21332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1148),
+            id: DeclarationId(1151),
             name: Some("go_int_add".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -33773,22 +33853,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 21334, 21475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1149),
+            id: DeclarationId(1152),
             name: Some("go_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -33807,22 +33887,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 21477, 21618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1150),
+            id: DeclarationId(1153),
             name: Some("go_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -33841,22 +33921,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 21620, 21761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1151),
+            id: DeclarationId(1154),
             name: Some("go_int_div".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -33877,22 +33957,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 21763, 21911),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1152),
+            id: DeclarationId(1155),
             name: Some("go_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -33911,22 +33991,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 21913, 22053),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1153),
+            id: DeclarationId(1156),
             name: Some("go_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -33945,22 +34025,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22055, 22202),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1154),
+            id: DeclarationId(1157),
             name: Some("go_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -33979,22 +34059,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22204, 22351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1155),
+            id: DeclarationId(1158),
             name: Some("go_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34013,22 +34093,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22353, 22514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1156),
+            id: DeclarationId(1159),
             name: Some("go_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34047,22 +34127,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22516, 22656),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1157),
+            id: DeclarationId(1160),
             name: Some("go_node_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34081,22 +34161,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22658, 22805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1158),
+            id: DeclarationId(1161),
             name: Some("go_port_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34115,22 +34195,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22807, 22954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1159),
+            id: DeclarationId(1162),
             name: Some("go_declaration_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34149,22 +34229,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22956, 23117),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1160),
+            id: DeclarationId(1163),
             name: Some("go_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34183,22 +34263,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23119, 23258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1161),
+            id: DeclarationId(1164),
             name: Some("go_int_le".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34217,22 +34297,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23260, 23400),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1162),
+            id: DeclarationId(1165),
             name: Some("go_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34251,22 +34331,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23402, 23541),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1163),
+            id: DeclarationId(1166),
             name: Some("go_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34285,22 +34365,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23543, 23683),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1164),
+            id: DeclarationId(1167),
             name: Some("go_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34319,22 +34399,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23685, 23834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1165),
+            id: DeclarationId(1168),
             name: Some("go_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34353,26 +34433,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23836, 23985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1166),
+            id: DeclarationId(1169),
             name: Some("go_let_stmt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(897),
+                template: DeclarationId(900),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(897)),
+            meta_tag: Some(DeclarationId(900)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1076)),
+                        FieldValue::Reference(DeclarationId(1079)),
                     ),
                     (
                         "carrier".to_string(),
@@ -34388,26 +34468,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23987, 24120),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1167),
+            id: DeclarationId(1170),
             name: Some("go_if_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(897),
+                template: DeclarationId(900),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(897)),
+            meta_tag: Some(DeclarationId(900)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1074)),
+                        FieldValue::Reference(DeclarationId(1077)),
                     ),
                     (
                         "carrier".to_string(),
@@ -34423,26 +34503,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24122, 24265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1168),
+            id: DeclarationId(1171),
             name: Some("go_main_wrap".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(897),
+                template: DeclarationId(900),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(897)),
+            meta_tag: Some(DeclarationId(900)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1077)),
+                        FieldValue::Reference(DeclarationId(1080)),
                     ),
                     (
                         "carrier".to_string(),
@@ -34458,22 +34538,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24267, 24420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1169),
+            id: DeclarationId(1172),
             name: Some("go_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34482,7 +34562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1928),
+                            constructor: DeclarationId(1932),
                             payload: vec![],
                         },
                     ),
@@ -34495,22 +34575,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24422, 24560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1170),
+            id: DeclarationId(1173),
             name: Some("go_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34519,7 +34599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1929),
+                            constructor: DeclarationId(1933),
                             payload: vec![],
                         },
                     ),
@@ -34530,7 +34610,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1919),
+                                    constructor: DeclarationId(1923),
                                     payload: vec![],
                                 },
                             ),
@@ -34544,22 +34624,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24562, 24754),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1171),
+            id: DeclarationId(1174),
             name: Some("go_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34568,7 +34648,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -34580,7 +34660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1919),
+                                        constructor: DeclarationId(1923),
                                         payload: vec![],
                                     },
                                 ),
@@ -34590,7 +34670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1919),
+                                        constructor: DeclarationId(1923),
                                         payload: vec![],
                                     },
                                 ),
@@ -34605,22 +34685,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24756, 24973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1172),
+            id: DeclarationId(1175),
             name: Some("go_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34629,7 +34709,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![],
                         },
                     ),
@@ -34641,7 +34721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1919),
+                                        constructor: DeclarationId(1923),
                                         payload: vec![],
                                     },
                                 ),
@@ -34651,7 +34731,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1919),
+                                        constructor: DeclarationId(1923),
                                         payload: vec![],
                                     },
                                 ),
@@ -34666,22 +34746,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24975, 25198),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1173),
+            id: DeclarationId(1176),
             name: Some("go_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34690,7 +34770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1932),
+                            constructor: DeclarationId(1936),
                             payload: vec![],
                         },
                     ),
@@ -34701,7 +34781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1918),
+                                    constructor: DeclarationId(1922),
                                     payload: vec![],
                                 },
                             ),
@@ -34715,22 +34795,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25200, 25383),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1174),
+            id: DeclarationId(1177),
             name: Some("go_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(905),
+                template: DeclarationId(908),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(905)),
+            meta_tag: Some(DeclarationId(908)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34748,22 +34828,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25385, 25521),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1175),
+            id: DeclarationId(1178),
             name: Some("go_result_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(905),
+                template: DeclarationId(908),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(905)),
+            meta_tag: Some(DeclarationId(908)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34783,22 +34863,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 26207, 26360),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1176),
+            id: DeclarationId(1179),
             name: Some("go_map_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(905),
+                template: DeclarationId(908),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(905)),
+            meta_tag: Some(DeclarationId(908)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34816,22 +34896,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 26362, 26502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1177),
+            id: DeclarationId(1180),
             name: Some("go_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34840,7 +34920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1933),
+                            constructor: DeclarationId(1937),
                             payload: vec![],
                         },
                     ),
@@ -34851,7 +34931,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1918),
+                                    constructor: DeclarationId(1922),
                                     payload: vec![],
                                 },
                             ),
@@ -34865,22 +34945,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 26504, 26692),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1178),
+            id: DeclarationId(1181),
             name: Some("go_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34889,7 +34969,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1934),
+                            constructor: DeclarationId(1938),
                             payload: vec![],
                         },
                     ),
@@ -34901,7 +34981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -34911,7 +34991,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1919),
+                                        constructor: DeclarationId(1923),
                                         payload: vec![],
                                     },
                                 ),
@@ -34921,7 +35001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -34936,22 +35016,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 26694, 26951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1179),
+            id: DeclarationId(1182),
             name: Some("go_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -34960,7 +35040,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1935),
+                            constructor: DeclarationId(1939),
                             payload: vec![],
                         },
                     ),
@@ -34972,7 +35052,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -34982,7 +35062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -34997,22 +35077,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 26953, 27167),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1180),
+            id: DeclarationId(1183),
             name: Some("go_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -35021,7 +35101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1936),
+                            constructor: DeclarationId(1940),
                             payload: vec![],
                         },
                     ),
@@ -35033,7 +35113,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -35043,7 +35123,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -35058,22 +35138,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 27169, 27392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1181),
+            id: DeclarationId(1184),
             name: Some("go_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -35082,7 +35162,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1937),
+                            constructor: DeclarationId(1941),
                             payload: vec![],
                         },
                     ),
@@ -35094,7 +35174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -35104,7 +35184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -35119,22 +35199,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 27394, 27623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1182),
+            id: DeclarationId(1185),
             name: Some("go_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(907),
+                template: DeclarationId(910),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(907)),
+            meta_tag: Some(DeclarationId(910)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "target".to_string(),
@@ -35143,17 +35223,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1939),
+                            constructor: DeclarationId(1943),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1496)),
+                        FieldValue::Reference(DeclarationId(1499)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1498)),
+                        FieldValue::Reference(DeclarationId(1501)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -35183,15 +35263,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 27710, 28016),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1183),
+            id: DeclarationId(1186),
             name: Some("go_statements".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(912),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(912)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35213,15 +35293,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28018, 28148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1184),
+            id: DeclarationId(1187),
             name: Some("go_expressions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(910),
+                template: DeclarationId(913),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(910)),
+            meta_tag: Some(DeclarationId(913)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35247,15 +35327,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28150, 28310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1185),
+            id: DeclarationId(1188),
             name: Some("go_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(912),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(912)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35292,15 +35372,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28312, 28513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1186),
+            id: DeclarationId(1189),
             name: Some("go_literals".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35324,15 +35404,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28515, 28625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1187),
+            id: DeclarationId(1190),
             name: Some("go_modules".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(914),
+                template: DeclarationId(917),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(914)),
+            meta_tag: Some(DeclarationId(917)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35346,15 +35426,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28627, 28684),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1188),
+            id: DeclarationId(1191),
             name: Some("go_functions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(918),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(918)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35392,15 +35472,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28686, 28971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1189),
+            id: DeclarationId(1192),
             name: Some("go_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(916),
+                template: DeclarationId(919),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(916)),
+            meta_tag: Some(DeclarationId(919)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35414,15 +35494,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28973, 29052),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1190),
+            id: DeclarationId(1193),
             name: Some("go_type_defs".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(917),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(917)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35458,15 +35538,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29054, 29277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1191),
+            id: DeclarationId(1194),
             name: Some("go_patterns".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(919),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(919)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35512,15 +35592,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29279, 29571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1192),
+            id: DeclarationId(1195),
             name: Some("go_collection_ops".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(920),
+                template: DeclarationId(923),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(920)),
+            meta_tag: Some(DeclarationId(923)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35586,15 +35666,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29573, 30008),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1193),
+            id: DeclarationId(1196),
             name: Some("go_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(921),
+                template: DeclarationId(924),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(921)),
+            meta_tag: Some(DeclarationId(924)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35630,15 +35710,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 30010, 30278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1194),
+            id: DeclarationId(1197),
             name: Some("go_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(918),
+                template: DeclarationId(921),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(918)),
+            meta_tag: Some(DeclarationId(921)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35658,66 +35738,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 31035, 31150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1195),
+            id: DeclarationId(1198),
             name: Some("go_language".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(925),
+                template: DeclarationId(928),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(925)),
+            meta_tag: Some(DeclarationId(928)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1183)),
+                        FieldValue::Reference(DeclarationId(1186)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1184)),
+                        FieldValue::Reference(DeclarationId(1187)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1185)),
+                        FieldValue::Reference(DeclarationId(1188)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1186)),
+                        FieldValue::Reference(DeclarationId(1189)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1187)),
+                        FieldValue::Reference(DeclarationId(1190)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1188)),
+                        FieldValue::Reference(DeclarationId(1191)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1189)),
+                        FieldValue::Reference(DeclarationId(1192)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1190)),
+                        FieldValue::Reference(DeclarationId(1193)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1194)),
+                        FieldValue::Reference(DeclarationId(1197)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1191)),
+                        FieldValue::Reference(DeclarationId(1194)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1192)),
+                        FieldValue::Reference(DeclarationId(1195)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1193)),
+                        FieldValue::Reference(DeclarationId(1196)),
                     ),
                 ],
             }),
@@ -35726,15 +35806,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 31152, 31571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1196),
+            id: DeclarationId(1199),
             name: Some("go_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(824),
+                template: DeclarationId(827),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(824)),
+            meta_tag: Some(DeclarationId(827)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35762,15 +35842,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 33238, 33374),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1197),
+            id: DeclarationId(1200),
             name: Some("go_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(815),
+                template: DeclarationId(818),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(815)),
+            meta_tag: Some(DeclarationId(818)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35778,55 +35858,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1791),
+                            constructor: DeclarationId(1795),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1794),
+                            constructor: DeclarationId(1798),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1797),
+                            constructor: DeclarationId(1801),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1800),
+                            constructor: DeclarationId(1804),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1804),
+                            constructor: DeclarationId(1808),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1806),
+                            constructor: DeclarationId(1810),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1810),
+                            constructor: DeclarationId(1814),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -35852,7 +35932,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1813),
+                                    constructor: DeclarationId(1817),
                                     payload: vec![],
                                 },
                             ),
@@ -35865,26 +35945,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 33376, 33934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1198),
+            id: DeclarationId(1201),
             name: Some("go_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(816),
+                template: DeclarationId(819),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(816)),
+            meta_tag: Some(DeclarationId(819)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1197)),
+                        FieldValue::Reference(DeclarationId(1200)),
                     ),
                 ],
             }),
@@ -35893,15 +35973,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 33936, 34060),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1199),
+            id: DeclarationId(1202),
             name: Some("python_statements".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(912),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(912)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35921,15 +36001,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 1887, 2009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1200),
+            id: DeclarationId(1203),
             name: Some("python_expressions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(910),
+                template: DeclarationId(913),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(910)),
+            meta_tag: Some(DeclarationId(913)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35955,15 +36035,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2011, 2164),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1201),
+            id: DeclarationId(1204),
             name: Some("python_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(912),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(912)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36000,15 +36080,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2166, 2381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1202),
+            id: DeclarationId(1205),
             name: Some("python_literals".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36032,15 +36112,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2383, 2497),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1203),
+            id: DeclarationId(1206),
             name: Some("python_modules".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(914),
+                template: DeclarationId(917),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(914)),
+            meta_tag: Some(DeclarationId(917)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36054,15 +36134,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2499, 2560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1204),
+            id: DeclarationId(1207),
             name: Some("python_functions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(918),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(918)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36100,15 +36180,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2562, 2869),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1205),
+            id: DeclarationId(1208),
             name: Some("python_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(916),
+                template: DeclarationId(919),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(916)),
+            meta_tag: Some(DeclarationId(919)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36124,15 +36204,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2871, 2970),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1206),
+            id: DeclarationId(1209),
             name: Some("python_type_definitions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(917),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(917)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36172,15 +36252,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2972, 3303),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1207),
+            id: DeclarationId(1210),
             name: Some("python_patterns".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(919),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(919)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36226,15 +36306,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 3305, 3635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1208),
+            id: DeclarationId(1211),
             name: Some("python_collections".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(920),
+                template: DeclarationId(923),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(920)),
+            meta_tag: Some(DeclarationId(923)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36292,15 +36372,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 3637, 4026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1209),
+            id: DeclarationId(1212),
             name: Some("python_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(921),
+                template: DeclarationId(924),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(921)),
+            meta_tag: Some(DeclarationId(924)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36332,15 +36412,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 4028, 4280),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1210),
+            id: DeclarationId(1213),
             name: Some("python_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(918),
+                template: DeclarationId(921),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(918)),
+            meta_tag: Some(DeclarationId(921)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36360,66 +36440,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 4483, 4602),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1211),
+            id: DeclarationId(1214),
             name: Some("python_language".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(925),
+                template: DeclarationId(928),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(925)),
+            meta_tag: Some(DeclarationId(928)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1199)),
+                        FieldValue::Reference(DeclarationId(1202)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1200)),
+                        FieldValue::Reference(DeclarationId(1203)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1201)),
+                        FieldValue::Reference(DeclarationId(1204)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1202)),
+                        FieldValue::Reference(DeclarationId(1205)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1203)),
+                        FieldValue::Reference(DeclarationId(1206)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1204)),
+                        FieldValue::Reference(DeclarationId(1207)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1205)),
+                        FieldValue::Reference(DeclarationId(1208)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1206)),
+                        FieldValue::Reference(DeclarationId(1209)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1210)),
+                        FieldValue::Reference(DeclarationId(1213)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1207)),
+                        FieldValue::Reference(DeclarationId(1210)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1208)),
+                        FieldValue::Reference(DeclarationId(1211)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1209)),
+                        FieldValue::Reference(DeclarationId(1212)),
                     ),
                 ],
             }),
@@ -36428,15 +36508,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 4604, 5079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1212),
+            id: DeclarationId(1215),
             name: Some("python_target".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(850),
+                template: DeclarationId(853),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(850)),
+            meta_tag: Some(DeclarationId(853)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36444,14 +36524,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1855),
+                            constructor: DeclarationId(1859),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1862),
                             payload: vec![],
                         },
                     ),
@@ -36462,22 +36542,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 5081, 5178),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1213),
+            id: DeclarationId(1216),
             name: Some("python_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(852),
+                template: DeclarationId(855),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(852)),
+            meta_tag: Some(DeclarationId(855)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "internal".to_string(),
-                        FieldValue::Reference(DeclarationId(853)),
+                        FieldValue::Reference(DeclarationId(856)),
                     ),
                     (
                         "additional_excluded_prefixes".to_string(),
@@ -36490,15 +36570,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 5180, 5316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1214),
+            id: DeclarationId(1217),
             name: Some("python_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(854),
+                template: DeclarationId(857),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(854)),
+            meta_tag: Some(DeclarationId(857)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -36511,22 +36591,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 5318, 5397),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1215),
+            id: DeclarationId(1218),
             name: Some("python_int".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -36549,22 +36629,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 5399, 5535),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1216),
+            id: DeclarationId(1219),
             name: Some("python_integer_inhabit_at_i32_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(892),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(892)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -36577,15 +36657,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1914),
+                            constructor: DeclarationId(1918),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1590),
+                                constructor: DeclarationId(1593),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(-2147483648)),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1589),
+                                        constructor: DeclarationId(1592),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1587),
+                                            constructor: DeclarationId(1590),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 4294967295,
                                             ))],
@@ -36597,7 +36677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1215)),
+                        FieldValue::Reference(DeclarationId(1218)),
                     ),
                 ],
             }),
@@ -36606,22 +36686,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 5628, 5937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1217),
+            id: DeclarationId(1220),
             name: Some("python_integer_inhabit_unbounded_decl".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(892),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(892)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -36634,16 +36714,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1914),
+                            constructor: DeclarationId(1918),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1591),
+                                constructor: DeclarationId(1594),
                                 payload: vec![],
                             }],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1215)),
+                        FieldValue::Reference(DeclarationId(1218)),
                     ),
                 ],
             }),
@@ -36652,22 +36732,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6015, 6225),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1218),
+            id: DeclarationId(1221),
             name: Some("python_bool".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -36690,22 +36770,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6227, 6366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1219),
+            id: DeclarationId(1222),
             name: Some("python_string".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -36728,22 +36808,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6368, 6510),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1220),
+            id: DeclarationId(1223),
             name: Some("python_node_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -36766,22 +36846,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6512, 6658),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1221),
+            id: DeclarationId(1224),
             name: Some("python_port_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -36804,22 +36884,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6660, 6806),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1222),
+            id: DeclarationId(1225),
             name: Some("python_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -36842,26 +36922,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6808, 6975),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1223),
+            id: DeclarationId(1226),
             name: Some("python_declaration_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1078)),
+                        FieldValue::Reference(DeclarationId(1081)),
                     ),
                     (
                         "carrier".to_string(),
@@ -36880,22 +36960,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6977, 7146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1224),
+            id: DeclarationId(1227),
             name: Some("python_source_span".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -36918,22 +36998,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7148, 7307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1225),
+            id: DeclarationId(1228),
             name: Some("python_dag_port".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -36956,22 +37036,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7309, 7459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1226),
+            id: DeclarationId(1229),
             name: Some("python_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -36994,22 +37074,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7461, 7620),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1227),
+            id: DeclarationId(1230),
             name: Some("python_value_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -37032,22 +37112,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7622, 7778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1228),
+            id: DeclarationId(1231),
             name: Some("python_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -37070,22 +37150,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7780, 7948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1229),
+            id: DeclarationId(1232),
             name: Some("python_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -37108,22 +37188,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7950, 8109),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1230),
+            id: DeclarationId(1233),
             name: Some("python_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -37146,22 +37226,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8111, 8264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1231),
+            id: DeclarationId(1234),
             name: Some("python_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -37184,22 +37264,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8266, 8419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1232),
+            id: DeclarationId(1235),
             name: Some("python_behavior".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -37222,22 +37302,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8421, 8573),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1233),
+            id: DeclarationId(1236),
             name: Some("python_dag".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -37260,26 +37340,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8575, 8712),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1234),
+            id: DeclarationId(1237),
             name: Some("python_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(995)),
+                        FieldValue::Reference(DeclarationId(998)),
                     ),
                     (
                         "carrier".to_string(),
@@ -37299,7 +37379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1915),
+                                    constructor: DeclarationId(1919),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -37319,26 +37399,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8786, 9035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1235),
+            id: DeclarationId(1238),
             name: Some("python_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1008)),
+                        FieldValue::Reference(DeclarationId(1011)),
                     ),
                     (
                         "carrier".to_string(),
@@ -37357,26 +37437,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9037, 9199),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1236),
+            id: DeclarationId(1239),
             name: Some("python_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(996)),
+                        FieldValue::Reference(DeclarationId(999)),
                     ),
                     (
                         "carrier".to_string(),
@@ -37397,7 +37477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -37416,7 +37496,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -37437,7 +37517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -37458,26 +37538,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9201, 9607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1237),
+            id: DeclarationId(1240),
             name: Some("python_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(997)),
+                        FieldValue::Reference(DeclarationId(1000)),
                     ),
                     (
                         "carrier".to_string(),
@@ -37498,7 +37578,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -37517,7 +37597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -37538,26 +37618,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9609, 9926),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1238),
+            id: DeclarationId(1241),
             name: Some("python_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(998)),
+                        FieldValue::Reference(DeclarationId(1001)),
                     ),
                     (
                         "carrier".to_string(),
@@ -37578,7 +37658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -37597,7 +37677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -37616,7 +37696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -37637,26 +37717,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9928, 10338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1239),
+            id: DeclarationId(1242),
             name: Some("python_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(999)),
+                        FieldValue::Reference(DeclarationId(1002)),
                     ),
                     (
                         "carrier".to_string(),
@@ -37675,26 +37755,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 10340, 10511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1240),
+            id: DeclarationId(1243),
             name: Some("python_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1000)),
+                        FieldValue::Reference(DeclarationId(1003)),
                     ),
                     (
                         "carrier".to_string(),
@@ -37713,26 +37793,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 10513, 10675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1241),
+            id: DeclarationId(1244),
             name: Some("python_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1001)),
+                        FieldValue::Reference(DeclarationId(1004)),
                     ),
                     (
                         "carrier".to_string(),
@@ -37753,7 +37833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -37772,7 +37852,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -37791,7 +37871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -37812,26 +37892,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 10677, 11096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1242),
+            id: DeclarationId(1245),
             name: Some("python_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1002)),
+                        FieldValue::Reference(DeclarationId(1005)),
                     ),
                     (
                         "carrier".to_string(),
@@ -37852,7 +37932,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -37873,7 +37953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -37892,7 +37972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -37911,7 +37991,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -37932,26 +38012,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 11098, 11591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1243),
+            id: DeclarationId(1246),
             name: Some("python_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1003)),
+                        FieldValue::Reference(DeclarationId(1006)),
                     ),
                     (
                         "carrier".to_string(),
@@ -37972,7 +38052,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -37991,7 +38071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -38010,7 +38090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -38031,26 +38111,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 11593, 12007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1244),
+            id: DeclarationId(1247),
             name: Some("python_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1004)),
+                        FieldValue::Reference(DeclarationId(1007)),
                     ),
                     (
                         "carrier".to_string(),
@@ -38071,7 +38151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -38090,7 +38170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -38109,7 +38189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -38130,26 +38210,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 12009, 12435),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1245),
+            id: DeclarationId(1248),
             name: Some("python_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1005)),
+                        FieldValue::Reference(DeclarationId(1008)),
                     ),
                     (
                         "carrier".to_string(),
@@ -38168,26 +38248,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 12437, 12608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1246),
+            id: DeclarationId(1249),
             name: Some("python_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1006)),
+                        FieldValue::Reference(DeclarationId(1009)),
                     ),
                     (
                         "carrier".to_string(),
@@ -38206,26 +38286,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 12610, 12781),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1247),
+            id: DeclarationId(1250),
             name: Some("python_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1007)),
+                        FieldValue::Reference(DeclarationId(1010)),
                     ),
                     (
                         "carrier".to_string(),
@@ -38244,22 +38324,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 12783, 12945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1248),
+            id: DeclarationId(1251),
             name: Some("python_int_add".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -38278,22 +38358,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 12947, 13096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1249),
+            id: DeclarationId(1252),
             name: Some("python_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -38312,22 +38392,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13098, 13247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1250),
+            id: DeclarationId(1253),
             name: Some("python_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -38346,22 +38426,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13249, 13398),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1251),
+            id: DeclarationId(1254),
             name: Some("python_int_div".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -38382,22 +38462,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13400, 13559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1252),
+            id: DeclarationId(1255),
             name: Some("python_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -38416,22 +38496,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13561, 13709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1253),
+            id: DeclarationId(1256),
             name: Some("python_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -38450,22 +38530,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13711, 13866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1254),
+            id: DeclarationId(1257),
             name: Some("python_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -38484,22 +38564,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13868, 14023),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1255),
+            id: DeclarationId(1258),
             name: Some("python_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -38518,22 +38598,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14025, 14194),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1256),
+            id: DeclarationId(1259),
             name: Some("python_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -38552,22 +38632,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14196, 14344),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1257),
+            id: DeclarationId(1260),
             name: Some("python_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -38586,22 +38666,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14346, 14493),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1258),
+            id: DeclarationId(1261),
             name: Some("python_int_le".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -38620,22 +38700,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14495, 14643),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1259),
+            id: DeclarationId(1262),
             name: Some("python_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -38654,22 +38734,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14645, 14792),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1260),
+            id: DeclarationId(1263),
             name: Some("python_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -38688,22 +38768,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14794, 14942),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1261),
+            id: DeclarationId(1264),
             name: Some("python_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -38722,22 +38802,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14944, 15102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1262),
+            id: DeclarationId(1265),
             name: Some("python_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -38756,22 +38836,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15104, 15261),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1263),
+            id: DeclarationId(1266),
             name: Some("python_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -38780,7 +38860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1928),
+                            constructor: DeclarationId(1932),
                             payload: vec![],
                         },
                     ),
@@ -38793,22 +38873,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15263, 15409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1264),
+            id: DeclarationId(1267),
             name: Some("python_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -38817,7 +38897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1929),
+                            constructor: DeclarationId(1933),
                             payload: vec![],
                         },
                     ),
@@ -38828,7 +38908,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1919),
+                                    constructor: DeclarationId(1923),
                                     payload: vec![],
                                 },
                             ),
@@ -38842,22 +38922,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15411, 15611),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1265),
+            id: DeclarationId(1268),
             name: Some("python_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -38866,7 +38946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -38878,7 +38958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1919),
+                                        constructor: DeclarationId(1923),
                                         payload: vec![],
                                     },
                                 ),
@@ -38888,7 +38968,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1919),
+                                        constructor: DeclarationId(1923),
                                         payload: vec![],
                                     },
                                 ),
@@ -38903,22 +38983,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15613, 15838),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1266),
+            id: DeclarationId(1269),
             name: Some("python_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -38927,7 +39007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![],
                         },
                     ),
@@ -38939,7 +39019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1919),
+                                        constructor: DeclarationId(1923),
                                         payload: vec![],
                                     },
                                 ),
@@ -38949,7 +39029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1919),
+                                        constructor: DeclarationId(1923),
                                         payload: vec![],
                                     },
                                 ),
@@ -38964,22 +39044,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15840, 16071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1267),
+            id: DeclarationId(1270),
             name: Some("python_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -38988,7 +39068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1932),
+                            constructor: DeclarationId(1936),
                             payload: vec![],
                         },
                     ),
@@ -38999,7 +39079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1918),
+                                    constructor: DeclarationId(1922),
                                     payload: vec![],
                                 },
                             ),
@@ -39013,22 +39093,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16073, 16264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1268),
+            id: DeclarationId(1271),
             name: Some("python_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -39037,7 +39117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1933),
+                            constructor: DeclarationId(1937),
                             payload: vec![],
                         },
                     ),
@@ -39048,7 +39128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1918),
+                                    constructor: DeclarationId(1922),
                                     payload: vec![],
                                 },
                             ),
@@ -39062,22 +39142,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16266, 16462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1269),
+            id: DeclarationId(1272),
             name: Some("python_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -39086,7 +39166,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1934),
+                            constructor: DeclarationId(1938),
                             payload: vec![],
                         },
                     ),
@@ -39098,7 +39178,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -39108,7 +39188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1919),
+                                        constructor: DeclarationId(1923),
                                         payload: vec![],
                                     },
                                 ),
@@ -39118,7 +39198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -39133,22 +39213,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16464, 16729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1270),
+            id: DeclarationId(1273),
             name: Some("python_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -39157,7 +39237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1935),
+                            constructor: DeclarationId(1939),
                             payload: vec![],
                         },
                     ),
@@ -39169,7 +39249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -39179,7 +39259,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -39194,22 +39274,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16731, 16953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1271),
+            id: DeclarationId(1274),
             name: Some("python_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -39218,7 +39298,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1936),
+                            constructor: DeclarationId(1940),
                             payload: vec![],
                         },
                     ),
@@ -39230,7 +39310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -39240,7 +39320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -39255,22 +39335,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16955, 17186),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1272),
+            id: DeclarationId(1275),
             name: Some("python_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -39279,7 +39359,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1937),
+                            constructor: DeclarationId(1941),
                             payload: vec![],
                         },
                     ),
@@ -39291,7 +39371,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -39301,7 +39381,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -39316,22 +39396,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 17188, 17425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1273),
+            id: DeclarationId(1276),
             name: Some("python_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(905),
+                template: DeclarationId(908),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(905)),
+            meta_tag: Some(DeclarationId(908)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -39348,24 +39428,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/spec/python.dag", 17427, 17575),
         });
-        declarations.push(Declaration { id: DeclarationId(1274), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(905)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1211))), ("target".to_string(), FieldValue::Reference(DeclarationId(11))), ("carrier".to_string(), FieldValue::Literal(LiteralBits::String("typing.Union[typing.Tuple[typing.Literal['Ok'], {key}], typing.Tuple[typing.Literal['Err'], {value}]]".to_string()))), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1)))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 17691, 17929) });
+        declarations.push(Declaration { id: DeclarationId(1277), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(908)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1214))), ("target".to_string(), FieldValue::Reference(DeclarationId(11))), ("carrier".to_string(), FieldValue::Literal(LiteralBits::String("typing.Union[typing.Tuple[typing.Literal['Ok'], {key}], typing.Tuple[typing.Literal['Err'], {value}]]".to_string()))), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1)))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 17691, 17929) });
         declarations.push(Declaration {
-            id: DeclarationId(1275),
+            id: DeclarationId(1278),
             name: Some("python_non_empty_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(905),
+                template: DeclarationId(908),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(905)),
+            meta_tag: Some(DeclarationId(908)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -39385,22 +39465,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 18020, 18194),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1276),
+            id: DeclarationId(1279),
             name: Some("python_non_singleton_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(905),
+                template: DeclarationId(908),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(905)),
+            meta_tag: Some(DeclarationId(908)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -39420,22 +39500,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 18196, 18382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1277),
+            id: DeclarationId(1280),
             name: Some("python_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(907),
+                template: DeclarationId(910),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(907)),
+            meta_tag: Some(DeclarationId(910)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "target".to_string(),
@@ -39444,17 +39524,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1939),
+                            constructor: DeclarationId(1943),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1496)),
+                        FieldValue::Reference(DeclarationId(1499)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1498)),
+                        FieldValue::Reference(DeclarationId(1501)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -39484,15 +39564,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 18383, 18697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1278),
+            id: DeclarationId(1281),
             name: Some("python_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(824),
+                template: DeclarationId(827),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(824)),
+            meta_tag: Some(DeclarationId(827)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -39520,15 +39600,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 20762, 20904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1279),
+            id: DeclarationId(1282),
             name: Some("python_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(815),
+                template: DeclarationId(818),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(815)),
+            meta_tag: Some(DeclarationId(818)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -39536,55 +39616,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1791),
+                            constructor: DeclarationId(1795),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1796),
+                            constructor: DeclarationId(1800),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1797),
+                            constructor: DeclarationId(1801),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1800),
+                            constructor: DeclarationId(1804),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1804),
+                            constructor: DeclarationId(1808),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1805),
+                            constructor: DeclarationId(1809),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1810),
+                            constructor: DeclarationId(1814),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1278)),
+                        FieldValue::Reference(DeclarationId(1281)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -39613,7 +39693,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1812),
+                                    constructor: DeclarationId(1816),
                                     payload: vec![],
                                 },
                             ),
@@ -39626,26 +39706,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 20906, 21486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1280),
+            id: DeclarationId(1283),
             name: Some("python_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(816),
+                template: DeclarationId(819),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(816)),
+            meta_tag: Some(DeclarationId(819)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1214)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1279)),
+                        FieldValue::Reference(DeclarationId(1282)),
                     ),
                 ],
             }),
@@ -39654,15 +39734,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 21488, 21624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1281),
+            id: DeclarationId(1284),
             name: Some("rust_execution_model".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(850),
+                template: DeclarationId(853),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(850)),
+            meta_tag: Some(DeclarationId(853)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -39670,14 +39750,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1857),
+                            constructor: DeclarationId(1861),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1862),
                             payload: vec![],
                         },
                     ),
@@ -39688,22 +39768,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 4448, 4550),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1282),
+            id: DeclarationId(1285),
             name: Some("rust_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(852),
+                template: DeclarationId(855),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(852)),
+            meta_tag: Some(DeclarationId(855)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "internal".to_string(),
-                        FieldValue::Reference(DeclarationId(853)),
+                        FieldValue::Reference(DeclarationId(856)),
                     ),
                     (
                         "additional_excluded_prefixes".to_string(),
@@ -39718,15 +39798,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 4552, 4704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1283),
+            id: DeclarationId(1286),
             name: Some("rust_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(854),
+                template: DeclarationId(857),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(854)),
+            meta_tag: Some(DeclarationId(857)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -39739,22 +39819,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 4706, 4781),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1284),
+            id: DeclarationId(1287),
             name: Some("rust_int".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -39777,22 +39857,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5232, 5364),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1285),
+            id: DeclarationId(1288),
             name: Some("rust_uint8".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -39815,22 +39895,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5366, 5501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1286),
+            id: DeclarationId(1289),
             name: Some("rust_i32".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -39853,22 +39933,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5503, 5637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1287),
+            id: DeclarationId(1290),
             name: Some("rust_u32".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -39891,22 +39971,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5639, 5774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1288),
+            id: DeclarationId(1291),
             name: Some("rust_i128".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -39929,22 +40009,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5776, 5913),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1289),
+            id: DeclarationId(1292),
             name: Some("rust_integer_inhabit_u32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(892),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(892)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -39957,15 +40037,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1914),
+                            constructor: DeclarationId(1918),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1590),
+                                constructor: DeclarationId(1593),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(0)),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1589),
+                                        constructor: DeclarationId(1592),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1587),
+                                            constructor: DeclarationId(1590),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 4294967295,
                                             ))],
@@ -39977,7 +40057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1287)),
+                        FieldValue::Reference(DeclarationId(1290)),
                     ),
                 ],
             }),
@@ -39986,22 +40066,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 6334, 6633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1290),
+            id: DeclarationId(1293),
             name: Some("rust_integer_inhabit_i32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(892),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(892)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -40014,15 +40094,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1914),
+                            constructor: DeclarationId(1918),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1590),
+                                constructor: DeclarationId(1593),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(-2147483648)),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1589),
+                                        constructor: DeclarationId(1592),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1587),
+                                            constructor: DeclarationId(1590),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 4294967295,
                                             ))],
@@ -40034,7 +40114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1286)),
+                        FieldValue::Reference(DeclarationId(1289)),
                     ),
                 ],
             }),
@@ -40043,22 +40123,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 6635, 6942),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1291),
+            id: DeclarationId(1294),
             name: Some("rust_integer_inhabit_i32_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(892),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(892)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -40071,13 +40151,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1913),
+                            constructor: DeclarationId(1917),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1286)),
+                        FieldValue::Reference(DeclarationId(1289)),
                     ),
                 ],
             }),
@@ -40086,22 +40166,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 6944, 7149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1292),
+            id: DeclarationId(1295),
             name: Some("rust_integer_inhabit_int64_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(892),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(892)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -40114,13 +40194,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1913),
+                            constructor: DeclarationId(1917),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1284)),
+                        FieldValue::Reference(DeclarationId(1287)),
                     ),
                 ],
             }),
@@ -40129,22 +40209,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 7151, 7354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1293),
+            id: DeclarationId(1296),
             name: Some("rust_integer_inhabit_i128_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(892),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(892)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -40157,13 +40237,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1913),
+                            constructor: DeclarationId(1917),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1288)),
+                        FieldValue::Reference(DeclarationId(1291)),
                     ),
                 ],
             }),
@@ -40172,22 +40252,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 7356, 7565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1294),
+            id: DeclarationId(1297),
             name: Some("rust_bool".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -40210,22 +40290,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 7567, 7702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1295),
+            id: DeclarationId(1298),
             name: Some("rust_string".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -40248,22 +40328,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 7704, 7846),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1296),
+            id: DeclarationId(1299),
             name: Some("rust_node_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -40286,22 +40366,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 7848, 7990),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1297),
+            id: DeclarationId(1300),
             name: Some("rust_port_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -40324,22 +40404,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 7992, 8134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1298),
+            id: DeclarationId(1301),
             name: Some("rust_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -40362,22 +40442,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8136, 8299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1299),
+            id: DeclarationId(1302),
             name: Some("rust_cluster_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -40400,22 +40480,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8301, 8452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1300),
+            id: DeclarationId(1303),
             name: Some("rust_type_shape".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -40439,7 +40519,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1915),
+                                    constructor: DeclarationId(1919),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -40459,22 +40539,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8454, 8699),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1301),
+            id: DeclarationId(1304),
             name: Some("rust_port_state".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -40497,22 +40577,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8701, 8853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1302),
+            id: DeclarationId(1305),
             name: Some("rust_port".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -40537,7 +40617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1916),
+                                        constructor: DeclarationId(1920),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -40556,7 +40636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1916),
+                                        constructor: DeclarationId(1920),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state_value".to_string(),
                                         ))],
@@ -40577,7 +40657,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -40598,22 +40678,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8855, 9251),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1303),
+            id: DeclarationId(1306),
             name: Some("rust_source_span".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -40638,7 +40718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -40657,7 +40737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -40676,7 +40756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -40697,22 +40777,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 9253, 9651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1304),
+            id: DeclarationId(1307),
             name: Some("rust_literal_bits".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -40735,22 +40815,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 9653, 9811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1305),
+            id: DeclarationId(1308),
             name: Some("rust_atom_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -40773,22 +40853,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 9813, 9971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1306),
+            id: DeclarationId(1309),
             name: Some("rust_cardinality_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -40811,22 +40891,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 9973, 10146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1307),
+            id: DeclarationId(1310),
             name: Some("rust_interval".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -40849,22 +40929,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10148, 10296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1308),
+            id: DeclarationId(1311),
             name: Some("rust_positive_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -40889,22 +40969,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10298, 10487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1309),
+            id: DeclarationId(1312),
             name: Some("rust_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -40927,22 +41007,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10489, 10653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1310),
+            id: DeclarationId(1313),
             name: Some("rust_conj_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -40967,7 +41047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -40986,7 +41066,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -41007,22 +41087,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10655, 10957),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1311),
+            id: DeclarationId(1314),
             name: Some("rust_template_argument".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -41049,7 +41129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -41068,7 +41148,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -41089,22 +41169,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10959, 11300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1312),
+            id: DeclarationId(1315),
             name: Some("rust_phantom_parameter".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -41131,7 +41211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -41150,7 +41230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -41171,22 +41251,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11302, 11647),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1313),
+            id: DeclarationId(1316),
             name: Some("rust_nominal_opacity".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -41212,7 +41292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1915),
+                                    constructor: DeclarationId(1919),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -41232,22 +41312,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11649, 11925),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1314),
+            id: DeclarationId(1317),
             name: Some("rust_field_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -41274,7 +41354,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "0".to_string(),
                                         ))],
@@ -41293,7 +41373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "1".to_string(),
                                         ))],
@@ -41314,22 +41394,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11927, 12244),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1315),
+            id: DeclarationId(1318),
             name: Some("rust_non_empty_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -41354,7 +41434,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -41373,7 +41453,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -41394,22 +41474,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 12246, 12566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1316),
+            id: DeclarationId(1319),
             name: Some("rust_non_singleton_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -41434,7 +41514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -41453,7 +41533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -41472,7 +41552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -41493,22 +41573,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 12568, 12981),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1317),
+            id: DeclarationId(1320),
             name: Some("rust_element_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -41532,7 +41612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1916),
+                                    constructor: DeclarationId(1920),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "index_of".to_string(),
                                     ))],
@@ -41552,22 +41632,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 12983, 13224),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1318),
+            id: DeclarationId(1321),
             name: Some("rust_param_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -41592,7 +41672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1916),
+                                        constructor: DeclarationId(1920),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -41611,7 +41691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1916),
+                                        constructor: DeclarationId(1920),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -41632,22 +41712,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13226, 13546),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1319),
+            id: DeclarationId(1322),
             name: Some("rust_transform_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -41671,7 +41751,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1916),
+                                    constructor: DeclarationId(1920),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -41691,22 +41771,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13548, 13793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1320),
+            id: DeclarationId(1323),
             name: Some("rust_member_descent".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -41730,7 +41810,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1915),
+                                    constructor: DeclarationId(1919),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -41750,22 +41830,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13795, 14040),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1321),
+            id: DeclarationId(1324),
             name: Some("rust_intra_cluster_call".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -41789,7 +41869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1915),
+                                    constructor: DeclarationId(1919),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -41809,22 +41889,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 14042, 14305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1322),
+            id: DeclarationId(1325),
             name: Some("rust_cluster".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -41849,7 +41929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -41870,7 +41950,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -41891,22 +41971,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 14307, 14644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1323),
+            id: DeclarationId(1326),
             name: Some("rust_field_value".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -41929,22 +42009,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 14646, 14801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1324),
+            id: DeclarationId(1327),
             name: Some("rust_value_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -41967,22 +42047,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 14803, 14955),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1325),
+            id: DeclarationId(1328),
             name: Some("rust_arrow_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -42005,22 +42085,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 14957, 15109),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1326),
+            id: DeclarationId(1329),
             name: Some("rust_type_connective".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -42043,22 +42123,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 15111, 15278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1327),
+            id: DeclarationId(1330),
             name: Some("rust_declaration".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -42083,7 +42163,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -42102,7 +42182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -42123,7 +42203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -42144,7 +42224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -42165,7 +42245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -42186,7 +42266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -42207,7 +42287,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -42228,7 +42308,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -42249,7 +42329,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -42268,7 +42348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -42289,22 +42369,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 15280, 16301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1328),
+            id: DeclarationId(1331),
             name: Some("rust_arithmetic_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -42327,22 +42407,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 16303, 16464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1329),
+            id: DeclarationId(1332),
             name: Some("rust_comparison_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -42365,22 +42445,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 16466, 16627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1330),
+            id: DeclarationId(1333),
             name: Some("rust_logical_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -42403,22 +42483,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 16629, 16781),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1331),
+            id: DeclarationId(1334),
             name: Some("rust_operator_kind".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -42441,22 +42521,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 16783, 16944),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1332),
+            id: DeclarationId(1335),
             name: Some("rust_transform_target".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -42479,22 +42559,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 16946, 17116),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1333),
+            id: DeclarationId(1336),
             name: Some("rust_branch_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -42517,22 +42597,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 17118, 17282),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1334),
+            id: DeclarationId(1337),
             name: Some("rust_payload_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -42559,7 +42639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -42580,7 +42660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -42601,22 +42681,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 17284, 17639),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1335),
+            id: DeclarationId(1338),
             name: Some("rust_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -42641,7 +42721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -42662,7 +42742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1916),
+                                        constructor: DeclarationId(1920),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -42681,7 +42761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -42700,7 +42780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -42721,22 +42801,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 17641, 18129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1336),
+            id: DeclarationId(1339),
             name: Some("rust_loop_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -42759,22 +42839,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 18131, 18283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1337),
+            id: DeclarationId(1340),
             name: Some("rust_value_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -42799,7 +42879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -42818,7 +42898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "data".to_string(),
                                         ))],
@@ -42839,7 +42919,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1916),
+                                        constructor: DeclarationId(1920),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -42858,7 +42938,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -42879,7 +42959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1916),
+                                        constructor: DeclarationId(1920),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -42900,22 +42980,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 18285, 19058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1338),
+            id: DeclarationId(1341),
             name: Some("rust_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -42940,7 +43020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -42959,7 +43039,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -42978,7 +43058,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -42999,7 +43079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1916),
+                                        constructor: DeclarationId(1920),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -43018,7 +43098,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -43039,22 +43119,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 19060, 19632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1339),
+            id: DeclarationId(1342),
             name: Some("rust_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -43079,7 +43159,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -43098,7 +43178,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -43117,7 +43197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -43138,7 +43218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1916),
+                                        constructor: DeclarationId(1920),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -43157,7 +43237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -43178,7 +43258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1916),
+                                        constructor: DeclarationId(1920),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -43199,22 +43279,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 19634, 20301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1340),
+            id: DeclarationId(1343),
             name: Some("rust_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -43239,7 +43319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -43258,7 +43338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -43277,7 +43357,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -43296,7 +43376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -43315,7 +43395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -43336,7 +43416,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1916),
+                                        constructor: DeclarationId(1920),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -43355,7 +43435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -43376,22 +43456,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 20303, 21012),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1341),
+            id: DeclarationId(1344),
             name: Some("rust_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -43416,7 +43496,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -43435,7 +43515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -43456,7 +43536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1916),
+                                        constructor: DeclarationId(1920),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -43475,7 +43555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -43494,7 +43574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -43515,7 +43595,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1916),
+                                        constructor: DeclarationId(1920),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -43536,7 +43616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1916),
+                                        constructor: DeclarationId(1920),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -43557,22 +43637,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 21014, 21774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1342),
+            id: DeclarationId(1345),
             name: Some("rust_behavior".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -43595,22 +43675,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 21776, 21924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1343),
+            id: DeclarationId(1346),
             name: Some("rust_dag".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -43637,7 +43717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1916),
+                                        constructor: DeclarationId(1920),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -43656,7 +43736,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1916),
+                                        constructor: DeclarationId(1920),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -43675,7 +43755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1916),
+                                        constructor: DeclarationId(1920),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -43696,7 +43776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1916),
+                                        constructor: DeclarationId(1920),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -43717,26 +43797,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 21926, 22406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1344),
+            id: DeclarationId(1347),
             name: Some("rust_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(995)),
+                        FieldValue::Reference(DeclarationId(998)),
                     ),
                     (
                         "carrier".to_string(),
@@ -43758,7 +43838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1915),
+                                    constructor: DeclarationId(1919),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -43778,26 +43858,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 22619, 22879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1345),
+            id: DeclarationId(1348),
             name: Some("rust_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1008)),
+                        FieldValue::Reference(DeclarationId(1011)),
                     ),
                     (
                         "carrier".to_string(),
@@ -43818,26 +43898,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 22881, 23054),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1346),
+            id: DeclarationId(1349),
             name: Some("rust_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(996)),
+                        FieldValue::Reference(DeclarationId(999)),
                     ),
                     (
                         "carrier".to_string(),
@@ -43860,7 +43940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -43879,7 +43959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -43900,7 +43980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -43921,26 +44001,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 23056, 23473),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1347),
+            id: DeclarationId(1350),
             name: Some("rust_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(997)),
+                        FieldValue::Reference(DeclarationId(1000)),
                     ),
                     (
                         "carrier".to_string(),
@@ -43963,7 +44043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -43982,7 +44062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -44003,26 +44083,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 23475, 23803),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1348),
+            id: DeclarationId(1351),
             name: Some("rust_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(998)),
+                        FieldValue::Reference(DeclarationId(1001)),
                     ),
                     (
                         "carrier".to_string(),
@@ -44045,7 +44125,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -44064,7 +44144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -44083,7 +44163,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -44104,26 +44184,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 23805, 24226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1349),
+            id: DeclarationId(1352),
             name: Some("rust_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(999)),
+                        FieldValue::Reference(DeclarationId(1002)),
                     ),
                     (
                         "carrier".to_string(),
@@ -44144,26 +44224,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 24228, 24410),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1350),
+            id: DeclarationId(1353),
             name: Some("rust_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1000)),
+                        FieldValue::Reference(DeclarationId(1003)),
                     ),
                     (
                         "carrier".to_string(),
@@ -44184,26 +44264,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 24412, 24585),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1351),
+            id: DeclarationId(1354),
             name: Some("rust_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1001)),
+                        FieldValue::Reference(DeclarationId(1004)),
                     ),
                     (
                         "carrier".to_string(),
@@ -44226,7 +44306,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -44245,7 +44325,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -44264,7 +44344,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -44285,26 +44365,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 24587, 25017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1352),
+            id: DeclarationId(1355),
             name: Some("rust_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1002)),
+                        FieldValue::Reference(DeclarationId(1005)),
                     ),
                     (
                         "carrier".to_string(),
@@ -44327,7 +44407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -44348,7 +44428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -44367,7 +44447,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -44386,7 +44466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -44407,26 +44487,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 25019, 25523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1353),
+            id: DeclarationId(1356),
             name: Some("rust_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1003)),
+                        FieldValue::Reference(DeclarationId(1006)),
                     ),
                     (
                         "carrier".to_string(),
@@ -44449,7 +44529,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -44468,7 +44548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -44487,7 +44567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -44508,26 +44588,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 25525, 25950),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1354),
+            id: DeclarationId(1357),
             name: Some("rust_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1004)),
+                        FieldValue::Reference(DeclarationId(1007)),
                     ),
                     (
                         "carrier".to_string(),
@@ -44550,7 +44630,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -44569,7 +44649,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -44588,7 +44668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1915),
+                                        constructor: DeclarationId(1919),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -44609,26 +44689,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 25952, 26389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1355),
+            id: DeclarationId(1358),
             name: Some("rust_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1005)),
+                        FieldValue::Reference(DeclarationId(1008)),
                     ),
                     (
                         "carrier".to_string(),
@@ -44649,26 +44729,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 26391, 26573),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1356),
+            id: DeclarationId(1359),
             name: Some("rust_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1006)),
+                        FieldValue::Reference(DeclarationId(1009)),
                     ),
                     (
                         "carrier".to_string(),
@@ -44689,26 +44769,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 26575, 26757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1357),
+            id: DeclarationId(1360),
             name: Some("rust_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1007)),
+                        FieldValue::Reference(DeclarationId(1010)),
                     ),
                     (
                         "carrier".to_string(),
@@ -44729,22 +44809,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 26759, 26932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1358),
+            id: DeclarationId(1361),
             name: Some("rust_int_add".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -44763,22 +44843,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 27787, 27932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1359),
+            id: DeclarationId(1362),
             name: Some("rust_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -44797,22 +44877,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 27934, 28079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1360),
+            id: DeclarationId(1363),
             name: Some("rust_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -44831,22 +44911,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 28081, 28226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1361),
+            id: DeclarationId(1364),
             name: Some("rust_int_div".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -44867,22 +44947,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 28228, 28386),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1362),
+            id: DeclarationId(1365),
             name: Some("rust_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -44901,22 +44981,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 28836, 28980),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1363),
+            id: DeclarationId(1366),
             name: Some("rust_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -44935,22 +45015,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 28982, 29133),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1364),
+            id: DeclarationId(1367),
             name: Some("rust_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -44969,22 +45049,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29135, 29286),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1365),
+            id: DeclarationId(1368),
             name: Some("rust_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45003,22 +45083,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29288, 29453),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1366),
+            id: DeclarationId(1369),
             name: Some("rust_string_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45037,22 +45117,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29646, 29796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1367),
+            id: DeclarationId(1370),
             name: Some("rust_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45071,22 +45151,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29798, 29942),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1368),
+            id: DeclarationId(1371),
             name: Some("rust_node_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45105,22 +45185,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29944, 30095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1369),
+            id: DeclarationId(1372),
             name: Some("rust_port_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45139,22 +45219,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 30097, 30248),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1370),
+            id: DeclarationId(1373),
             name: Some("rust_declaration_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45173,22 +45253,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 30250, 30415),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1371),
+            id: DeclarationId(1374),
             name: Some("rust_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45207,22 +45287,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 30417, 30560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1372),
+            id: DeclarationId(1375),
             name: Some("rust_int_le".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45241,22 +45321,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 30562, 30706),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1373),
+            id: DeclarationId(1376),
             name: Some("rust_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45275,22 +45355,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 30708, 30851),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1374),
+            id: DeclarationId(1377),
             name: Some("rust_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45309,22 +45389,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 30853, 30997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1375),
+            id: DeclarationId(1378),
             name: Some("rust_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45343,22 +45423,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 30999, 31152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1376),
+            id: DeclarationId(1379),
             name: Some("rust_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45377,26 +45457,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 31154, 31307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1377),
+            id: DeclarationId(1380),
             name: Some("rust_let_stmt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(897),
+                template: DeclarationId(900),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(897)),
+            meta_tag: Some(DeclarationId(900)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1076)),
+                        FieldValue::Reference(DeclarationId(1079)),
                     ),
                     (
                         "carrier".to_string(),
@@ -45412,26 +45492,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32057, 32196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1378),
+            id: DeclarationId(1381),
             name: Some("rust_if_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(897),
+                template: DeclarationId(900),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(897)),
+            meta_tag: Some(DeclarationId(900)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1074)),
+                        FieldValue::Reference(DeclarationId(1077)),
                     ),
                     (
                         "carrier".to_string(),
@@ -45447,26 +45527,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32198, 32345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1379),
+            id: DeclarationId(1382),
             name: Some("rust_main_wrap".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(897),
+                template: DeclarationId(900),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(897)),
+            meta_tag: Some(DeclarationId(900)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1077)),
+                        FieldValue::Reference(DeclarationId(1080)),
                     ),
                     (
                         "carrier".to_string(),
@@ -45483,22 +45563,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32347, 32517),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1380),
+            id: DeclarationId(1383),
             name: Some("rust_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45507,7 +45587,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1928),
+                            constructor: DeclarationId(1932),
                             payload: vec![],
                         },
                     ),
@@ -45520,22 +45600,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 33894, 34036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1381),
+            id: DeclarationId(1384),
             name: Some("rust_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45544,7 +45624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1929),
+                            constructor: DeclarationId(1933),
                             payload: vec![],
                         },
                     ),
@@ -45555,7 +45635,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1919),
+                                    constructor: DeclarationId(1923),
                                     payload: vec![],
                                 },
                             ),
@@ -45569,22 +45649,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 34038, 34234),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1382),
+            id: DeclarationId(1385),
             name: Some("rust_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45593,7 +45673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -45605,7 +45685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1919),
+                                        constructor: DeclarationId(1923),
                                         payload: vec![],
                                     },
                                 ),
@@ -45615,7 +45695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1919),
+                                        constructor: DeclarationId(1923),
                                         payload: vec![],
                                     },
                                 ),
@@ -45630,22 +45710,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 34236, 34457),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1383),
+            id: DeclarationId(1386),
             name: Some("rust_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45654,7 +45734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![],
                         },
                     ),
@@ -45666,7 +45746,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1919),
+                                        constructor: DeclarationId(1923),
                                         payload: vec![],
                                     },
                                 ),
@@ -45676,7 +45756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1919),
+                                        constructor: DeclarationId(1923),
                                         payload: vec![],
                                     },
                                 ),
@@ -45691,22 +45771,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 34459, 34686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1384),
+            id: DeclarationId(1387),
             name: Some("rust_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45715,7 +45795,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1932),
+                            constructor: DeclarationId(1936),
                             payload: vec![],
                         },
                     ),
@@ -45726,7 +45806,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1918),
+                                    constructor: DeclarationId(1922),
                                     payload: vec![],
                                 },
                             ),
@@ -45740,22 +45820,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 34688, 34875),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1385),
+            id: DeclarationId(1388),
             name: Some("rust_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(905),
+                template: DeclarationId(908),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(905)),
+            meta_tag: Some(DeclarationId(908)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45773,22 +45853,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 34877, 35020),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1386),
+            id: DeclarationId(1389),
             name: Some("rust_result_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(905),
+                template: DeclarationId(908),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(905)),
+            meta_tag: Some(DeclarationId(908)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45808,26 +45888,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 35299, 35470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1387),
+            id: DeclarationId(1390),
             name: Some("rust_lookup_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(905),
+                template: DeclarationId(908),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(905)),
+            meta_tag: Some(DeclarationId(908)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(990)),
+                        FieldValue::Reference(DeclarationId(993)),
                     ),
                     (
                         "carrier".to_string(),
@@ -45841,22 +45921,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 35472, 35622),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1388),
+            id: DeclarationId(1391),
             name: Some("rust_map_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(905),
+                template: DeclarationId(908),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(905)),
+            meta_tag: Some(DeclarationId(908)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45876,22 +45956,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 35624, 35774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1389),
+            id: DeclarationId(1392),
             name: Some("rust_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45900,7 +45980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1933),
+                            constructor: DeclarationId(1937),
                             payload: vec![],
                         },
                     ),
@@ -45911,7 +45991,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1918),
+                                    constructor: DeclarationId(1922),
                                     payload: vec![],
                                 },
                             ),
@@ -45925,22 +46005,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 35776, 35968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1390),
+            id: DeclarationId(1393),
             name: Some("rust_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -45949,7 +46029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1934),
+                            constructor: DeclarationId(1938),
                             payload: vec![],
                         },
                     ),
@@ -45961,7 +46041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -45971,7 +46051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1919),
+                                        constructor: DeclarationId(1923),
                                         payload: vec![],
                                     },
                                 ),
@@ -45981,7 +46061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -45996,22 +46076,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 35970, 36231),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1391),
+            id: DeclarationId(1394),
             name: Some("rust_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -46020,7 +46100,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1935),
+                            constructor: DeclarationId(1939),
                             payload: vec![],
                         },
                     ),
@@ -46032,7 +46112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -46042,7 +46122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -46057,22 +46137,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 36233, 36451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1392),
+            id: DeclarationId(1395),
             name: Some("rust_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -46081,7 +46161,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1936),
+                            constructor: DeclarationId(1940),
                             payload: vec![],
                         },
                     ),
@@ -46093,7 +46173,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -46103,7 +46183,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -46118,22 +46198,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 36453, 36680),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1393),
+            id: DeclarationId(1396),
             name: Some("rust_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -46142,7 +46222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1937),
+                            constructor: DeclarationId(1941),
                             payload: vec![],
                         },
                     ),
@@ -46154,7 +46234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -46164,7 +46244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1918),
+                                        constructor: DeclarationId(1922),
                                         payload: vec![],
                                     },
                                 ),
@@ -46179,22 +46259,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 36682, 36915),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1394),
+            id: DeclarationId(1397),
             name: Some("rust_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(907),
+                template: DeclarationId(910),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(907)),
+            meta_tag: Some(DeclarationId(910)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -46203,17 +46283,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1939),
+                            constructor: DeclarationId(1943),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1496)),
+                        FieldValue::Reference(DeclarationId(1499)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1498)),
+                        FieldValue::Reference(DeclarationId(1501)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -46245,15 +46325,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37143, 37447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1395),
+            id: DeclarationId(1398),
             name: Some("rust_statements".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(912),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(912)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46277,15 +46357,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37449, 37587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1396),
+            id: DeclarationId(1399),
             name: Some("rust_expressions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(910),
+                template: DeclarationId(913),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(910)),
+            meta_tag: Some(DeclarationId(913)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46311,15 +46391,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37589, 37742),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1397),
+            id: DeclarationId(1400),
             name: Some("rust_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(912),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(912)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46356,15 +46436,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37744, 37934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1398),
+            id: DeclarationId(1401),
             name: Some("rust_literals".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46388,15 +46468,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37936, 38048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1399),
+            id: DeclarationId(1402),
             name: Some("rust_modules".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(914),
+                template: DeclarationId(917),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(914)),
+            meta_tag: Some(DeclarationId(917)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46410,15 +46490,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38050, 38110),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1400),
+            id: DeclarationId(1403),
             name: Some("rust_functions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(918),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(918)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46456,15 +46536,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38112, 38390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1401),
+            id: DeclarationId(1404),
             name: Some("rust_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(916),
+                template: DeclarationId(919),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(916)),
+            meta_tag: Some(DeclarationId(919)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46478,15 +46558,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38392, 38480),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1402),
+            id: DeclarationId(1405),
             name: Some("rust_type_defs".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(917),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(917)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46524,15 +46604,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38482, 38784),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1403),
+            id: DeclarationId(1406),
             name: Some("rust_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(918),
+                template: DeclarationId(921),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(918)),
+            meta_tag: Some(DeclarationId(921)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46556,15 +46636,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38786, 38999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1404),
+            id: DeclarationId(1407),
             name: Some("rust_patterns".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(919),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(919)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46613,17 +46693,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/spec/rust.dag", 39001, 39336),
         });
-        declarations.push(Declaration { id: DeclarationId(1405), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(920), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(920)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __left = {left}; __left.extend({right}); __left }".to_string()))), ("length".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).len() as i64".to_string()))), ("is_empty".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).is_empty()".to_string()))), ("fold".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().fold({init}, {body})".to_string()))), ("map".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().map({body}).collect::<Vec<_>>()".to_string()))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 39338, 39929) });
+        declarations.push(Declaration { id: DeclarationId(1408), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(923), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(923)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __left = {left}; __left.extend({right}); __left }".to_string()))), ("length".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).len() as i64".to_string()))), ("is_empty".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).is_empty()".to_string()))), ("fold".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().fold({init}, {body})".to_string()))), ("map".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().map({body}).collect::<Vec<_>>()".to_string()))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 39338, 39929) });
         declarations.push(Declaration {
-            id: DeclarationId(1406),
+            id: DeclarationId(1409),
             name: Some("rust_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(921),
+                template: DeclarationId(924),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(921)),
+            meta_tag: Some(DeclarationId(924)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46659,15 +46739,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 39931, 40203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1407),
+            id: DeclarationId(1410),
             name: Some("rust_rendering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(922),
+                template: DeclarationId(925),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(922)),
+            meta_tag: Some(DeclarationId(925)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46675,14 +46755,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "read".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1940),
+                            constructor: DeclarationId(1944),
                             payload: vec![],
                         },
                     ),
                     (
                         "construct".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1942),
+                            constructor: DeclarationId(1946),
                             payload: vec![],
                         },
                     ),
@@ -46693,66 +46773,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 40205, 40286),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1408),
+            id: DeclarationId(1411),
             name: Some("rust_language".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(925),
+                template: DeclarationId(928),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(925)),
+            meta_tag: Some(DeclarationId(928)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1395)),
+                        FieldValue::Reference(DeclarationId(1398)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1396)),
+                        FieldValue::Reference(DeclarationId(1399)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1397)),
+                        FieldValue::Reference(DeclarationId(1400)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1398)),
+                        FieldValue::Reference(DeclarationId(1401)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1399)),
+                        FieldValue::Reference(DeclarationId(1402)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1400)),
+                        FieldValue::Reference(DeclarationId(1403)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1401)),
+                        FieldValue::Reference(DeclarationId(1404)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1402)),
+                        FieldValue::Reference(DeclarationId(1405)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1403)),
+                        FieldValue::Reference(DeclarationId(1406)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1404)),
+                        FieldValue::Reference(DeclarationId(1407)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1405)),
+                        FieldValue::Reference(DeclarationId(1408)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1406)),
+                        FieldValue::Reference(DeclarationId(1409)),
                     ),
                 ],
             }),
@@ -46761,15 +46841,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 40288, 40733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1409),
+            id: DeclarationId(1412),
             name: Some("rust_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(824),
+                template: DeclarationId(827),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(824)),
+            meta_tag: Some(DeclarationId(827)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46797,15 +46877,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 42157, 42296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1410),
+            id: DeclarationId(1413),
             name: Some("rust_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(815),
+                template: DeclarationId(818),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(815)),
+            meta_tag: Some(DeclarationId(818)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46813,55 +46893,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1791),
+                            constructor: DeclarationId(1795),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1794),
+                            constructor: DeclarationId(1798),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1798),
+                            constructor: DeclarationId(1802),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1800),
+                            constructor: DeclarationId(1804),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1803),
+                            constructor: DeclarationId(1807),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1806),
+                            constructor: DeclarationId(1810),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1809),
+                            constructor: DeclarationId(1813),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1409)),
+                        FieldValue::Reference(DeclarationId(1412)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -46893,7 +46973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1812),
+                                    constructor: DeclarationId(1816),
                                     payload: vec![],
                                 },
                             ),
@@ -46906,26 +46986,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 42298, 42911),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1411),
+            id: DeclarationId(1414),
             name: Some("rust_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(816),
+                template: DeclarationId(819),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(816)),
+            meta_tag: Some(DeclarationId(819)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1410)),
+                        FieldValue::Reference(DeclarationId(1413)),
                     ),
                 ],
             }),
@@ -46934,7 +47014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 42913, 43043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1412),
+            id: DeclarationId(1415),
             name: Some("rust_port_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(745),
@@ -46958,7 +47038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 44145, 44248),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1413),
+            id: DeclarationId(1416),
             name: Some("rust_node_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(745),
@@ -46982,7 +47062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 44250, 44353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1414),
+            id: DeclarationId(1417),
             name: Some("rust_resolve_producer_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(745),
@@ -47006,7 +47086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 44355, 44482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1415),
+            id: DeclarationId(1418),
             name: Some("port_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(746),
@@ -47025,11 +47105,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1412)),
+                        FieldValue::Reference(DeclarationId(1415)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                 ],
             }),
@@ -47038,7 +47118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 44484, 44615),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1416),
+            id: DeclarationId(1419),
             name: Some("node_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(746),
@@ -47057,11 +47137,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1413)),
+                        FieldValue::Reference(DeclarationId(1416)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                 ],
             }),
@@ -47070,7 +47150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 44617, 44748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1417),
+            id: DeclarationId(1420),
             name: Some("resolve_producer_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(746),
@@ -47089,11 +47169,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1414)),
+                        FieldValue::Reference(DeclarationId(1417)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                 ],
             }),
@@ -47102,7 +47182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 44750, 44917),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1418),
+            id: DeclarationId(1421),
             name: Some("rust_lane2_workflow_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(745),
@@ -47126,7 +47206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 45428, 45557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1419),
+            id: DeclarationId(1422),
             name: Some("lane2_workflow_at_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(746),
@@ -47145,11 +47225,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1418)),
+                        FieldValue::Reference(DeclarationId(1421)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                 ],
             }),
@@ -47158,7 +47238,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 45559, 45726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1420),
+            id: DeclarationId(1423),
             name: Some("rust_workflow_root_port_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(745),
@@ -47182,7 +47262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 46421, 46535),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1421),
+            id: DeclarationId(1424),
             name: Some("workflow_root_port_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(746),
@@ -47201,11 +47281,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1420)),
+                        FieldValue::Reference(DeclarationId(1423)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                 ],
             }),
@@ -47214,22 +47294,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 46537, 46710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1422),
+            id: DeclarationId(1425),
             name: Some("rust_workflow_root".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "target".to_string(),
@@ -47252,7 +47332,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 47122, 47283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1423),
+            id: DeclarationId(1426),
             name: Some("rust_declaration_by_id_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(745),
@@ -47276,7 +47356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 47610, 47733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1424),
+            id: DeclarationId(1427),
             name: Some("declaration_by_id_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(746),
@@ -47295,11 +47375,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1423)),
+                        FieldValue::Reference(DeclarationId(1426)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                 ],
             }),
@@ -47308,7 +47388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 47735, 47905),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1425),
+            id: DeclarationId(1428),
             name: Some("CompilerHostRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47327,21 +47407,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 453, 502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1426),
+            id: DeclarationId(1429),
             name: Some("PipelineSnapshotKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SnapshotSurface".to_string(),
-                        ty: DeclarationId(2240),
+                        ty: DeclarationId(2244),
                     },
                     Field {
                         label: "SnapshotDag".to_string(),
-                        ty: DeclarationId(2241),
+                        ty: DeclarationId(2245),
                     },
                     Field {
                         label: "SnapshotText".to_string(),
-                        ty: DeclarationId(2242),
+                        ty: DeclarationId(2246),
                     },
                 ],
             },
@@ -47356,21 +47436,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 504, 576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1427),
+            id: DeclarationId(1430),
             name: Some("PipelineStageBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "stage".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "realization".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "snapshot".to_string(),
-                        ty: DeclarationId(1426),
+                        ty: DeclarationId(1429),
                     },
                 ],
             },
@@ -47385,7 +47465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 578, 694),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1428),
+            id: DeclarationId(1431),
             name: Some("parse_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47395,7 +47475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1425)),
+            meta_tag: Some(DeclarationId(1428)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -47409,7 +47489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 696, 780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1429),
+            id: DeclarationId(1432),
             name: Some("lower_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47419,7 +47499,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1425)),
+            meta_tag: Some(DeclarationId(1428)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -47433,7 +47513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 782, 866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1430),
+            id: DeclarationId(1433),
             name: Some("infer_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47443,7 +47523,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1425)),
+            meta_tag: Some(DeclarationId(1428)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -47457,7 +47537,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 868, 952),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1431),
+            id: DeclarationId(1434),
             name: Some("compute_ownership_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47467,7 +47547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1425)),
+            meta_tag: Some(DeclarationId(1428)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -47483,7 +47563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 954, 1062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1432),
+            id: DeclarationId(1435),
             name: Some("emit_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47493,7 +47573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1425)),
+            meta_tag: Some(DeclarationId(1428)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -47507,7 +47587,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1064, 1146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1433),
+            id: DeclarationId(1436),
             name: Some("lens_complexity_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47517,7 +47597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1425)),
+            meta_tag: Some(DeclarationId(1428)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -47533,31 +47613,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1148, 1252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1434),
+            id: DeclarationId(1437),
             name: Some("parse_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1427),
+                template: DeclarationId(1430),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1427)),
+            meta_tag: Some(DeclarationId(1430)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1443)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1428)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2240),
+                            constructor: DeclarationId(2244),
                             payload: vec![],
                         },
                     ),
@@ -47568,31 +47648,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1254, 1382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1435),
+            id: DeclarationId(1438),
             name: Some("lower_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1427),
+                template: DeclarationId(1430),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1427)),
+            meta_tag: Some(DeclarationId(1430)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1441)),
+                        FieldValue::Reference(DeclarationId(1444)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1432)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2241),
+                            constructor: DeclarationId(2245),
                             payload: vec![],
                         },
                     ),
@@ -47603,31 +47683,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1384, 1508),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1436),
+            id: DeclarationId(1439),
             name: Some("infer_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1427),
+                template: DeclarationId(1430),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1427)),
+            meta_tag: Some(DeclarationId(1430)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1442)),
+                        FieldValue::Reference(DeclarationId(1445)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1430)),
+                        FieldValue::Reference(DeclarationId(1433)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2241),
+                            constructor: DeclarationId(2245),
                             payload: vec![],
                         },
                     ),
@@ -47638,31 +47718,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1510, 1634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1437),
+            id: DeclarationId(1440),
             name: Some("compute_ownership_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1427),
+                template: DeclarationId(1430),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1427)),
+            meta_tag: Some(DeclarationId(1430)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1443)),
+                        FieldValue::Reference(DeclarationId(1446)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1431)),
+                        FieldValue::Reference(DeclarationId(1434)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2241),
+                            constructor: DeclarationId(2245),
                             payload: vec![],
                         },
                     ),
@@ -47673,31 +47753,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1636, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1438),
+            id: DeclarationId(1441),
             name: Some("lens_complexity_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1427),
+                template: DeclarationId(1430),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1427)),
+            meta_tag: Some(DeclarationId(1430)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1444)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1433)),
+                        FieldValue::Reference(DeclarationId(1436)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2241),
+                            constructor: DeclarationId(2245),
                             payload: vec![],
                         },
                     ),
@@ -47708,31 +47788,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1798, 1952),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1439),
+            id: DeclarationId(1442),
             name: Some("emit_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1427),
+                template: DeclarationId(1430),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1427)),
+            meta_tag: Some(DeclarationId(1430)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1432)),
+                        FieldValue::Reference(DeclarationId(1435)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2242),
+                            constructor: DeclarationId(2246),
                             payload: vec![],
                         },
                     ),
@@ -47743,12 +47823,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1954, 2076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1440),
+            id: DeclarationId(1443),
             name: Some("parse".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197), DeclarationId(197)],
                 output: DeclarationId(744),
-                body: ArrowBody::ExternalRealization(DeclarationId(1428)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1431)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -47761,12 +47841,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2078, 2140),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1441),
+            id: DeclarationId(1444),
             name: Some("lower".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744)],
                 output: DeclarationId(744),
-                body: ArrowBody::ExternalRealization(DeclarationId(1429)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1432)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -47779,12 +47859,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2142, 2184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1442),
+            id: DeclarationId(1445),
             name: Some("infer".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744)],
                 output: DeclarationId(744),
-                body: ArrowBody::ExternalRealization(DeclarationId(1430)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1433)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -47797,12 +47877,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2186, 2228),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1443),
+            id: DeclarationId(1446),
             name: Some("compute_ownership".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744)],
                 output: DeclarationId(744),
-                body: ArrowBody::ExternalRealization(DeclarationId(1431)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1434)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -47815,12 +47895,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2230, 2288),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1444),
+            id: DeclarationId(1447),
             name: Some("lens_complexity".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744)],
                 output: DeclarationId(744),
-                body: ArrowBody::ExternalRealization(DeclarationId(1433)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1436)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -47833,17 +47913,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2290, 2347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1445),
+            id: DeclarationId(1448),
             name: Some("emit".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
                     DeclarationId(744),
                     DeclarationId(744),
                     DeclarationId(744),
-                    DeclarationId(925),
+                    DeclarationId(928),
                 ],
                 output: DeclarationId(197),
-                body: ArrowBody::ExternalRealization(DeclarationId(1432)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1435)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -47856,10 +47936,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2349, 2460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1446),
+            id: DeclarationId(1449),
             name: Some("compile".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(197), DeclarationId(197), DeclarationId(925)],
+                inputs: vec![DeclarationId(197), DeclarationId(197), DeclarationId(928)],
                 output: DeclarationId(197),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/pipeline.dag",
@@ -47878,11 +47958,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2462, 2605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1447),
+            id: DeclarationId(1450),
             name: Some("from_symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(2243),
+                output: DeclarationId(2247),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/operators.dag",
                     156,
@@ -47900,7 +47980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 108, 771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1448),
+            id: DeclarationId(1451),
             name: Some("symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(722)],
@@ -47918,7 +47998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 773, 1214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1449),
+            id: DeclarationId(1452),
             name: Some("algebra_field_name".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(722)],
@@ -47936,7 +48016,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1216, 2017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1450),
+            id: DeclarationId(1453),
             name: Some("LensRegistryEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -47965,15 +48045,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 1950, 2045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1451),
+            id: DeclarationId(1454),
             name: Some("lens_cost_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1450),
+                template: DeclarationId(1453),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1450)),
+            meta_tag: Some(DeclarationId(1453)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48001,15 +48081,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2047, 2214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1452),
+            id: DeclarationId(1455),
             name: Some("lens_cost_symbolic_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1450),
+                template: DeclarationId(1453),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1450)),
+            meta_tag: Some(DeclarationId(1453)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48037,15 +48117,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2216, 2404),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1453),
+            id: DeclarationId(1456),
             name: Some("lens_effect_enumeration_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1450),
+                template: DeclarationId(1453),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1450)),
+            meta_tag: Some(DeclarationId(1453)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48073,15 +48153,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2406, 2623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1454),
+            id: DeclarationId(1457),
             name: Some("lens_provenance_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1450),
+                template: DeclarationId(1453),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1450)),
+            meta_tag: Some(DeclarationId(1453)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48109,15 +48189,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2625, 2810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1455),
+            id: DeclarationId(1458),
             name: Some("lens_structural_resolution_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1450),
+                template: DeclarationId(1453),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1450)),
+            meta_tag: Some(DeclarationId(1453)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48148,15 +48228,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2812, 3041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1456),
+            id: DeclarationId(1459),
             name: Some("lens_unused_parameters_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1450),
+                template: DeclarationId(1453),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1450)),
+            meta_tag: Some(DeclarationId(1453)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48184,15 +48264,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3043, 3256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1457),
+            id: DeclarationId(1460),
             name: Some("lens_infer_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1450),
+                template: DeclarationId(1453),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1450)),
+            meta_tag: Some(DeclarationId(1453)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48220,15 +48300,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3883, 4075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1458),
+            id: DeclarationId(1461),
             name: Some("lens_variant_payload_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1450),
+                template: DeclarationId(1453),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1450)),
+            meta_tag: Some(DeclarationId(1453)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48256,15 +48336,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 4077, 4277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1459),
+            id: DeclarationId(1462),
             name: Some("lens_lower_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1450),
+                template: DeclarationId(1453),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1450)),
+            meta_tag: Some(DeclarationId(1453)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48292,17 +48372,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 4527, 4719),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1460),
+            id: DeclarationId(1463),
             name: Some("IntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OrderedRingAlgebra".to_string(),
-                        ty: DeclarationId(2244),
+                        ty: DeclarationId(2248),
                     },
                     Field {
                         label: "SemiringAlgebra".to_string(),
-                        ty: DeclarationId(2245),
+                        ty: DeclarationId(2249),
                     },
                 ],
             },
@@ -48317,17 +48397,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5528, 5590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1461),
+            id: DeclarationId(1464),
             name: Some("NonIntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BooleanAlgebraAlgebra".to_string(),
-                        ty: DeclarationId(2246),
+                        ty: DeclarationId(2250),
                     },
                     Field {
                         label: "TerminalAlgebra".to_string(),
-                        ty: DeclarationId(2247),
+                        ty: DeclarationId(2251),
                     },
                 ],
             },
@@ -48342,37 +48422,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5592, 5660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1462),
+            id: DeclarationId(1465),
             name: Some("TargetCarrier".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BitCarrier".to_string(),
-                        ty: DeclarationId(2248),
+                        ty: DeclarationId(2252),
                     },
                     Field {
                         label: "ByteCarrier".to_string(),
-                        ty: DeclarationId(2249),
+                        ty: DeclarationId(2253),
                     },
                     Field {
                         label: "Word16Carrier".to_string(),
-                        ty: DeclarationId(2250),
+                        ty: DeclarationId(2254),
                     },
                     Field {
                         label: "Word32Carrier".to_string(),
-                        ty: DeclarationId(2251),
+                        ty: DeclarationId(2255),
                     },
                     Field {
                         label: "Word64Carrier".to_string(),
-                        ty: DeclarationId(2252),
+                        ty: DeclarationId(2256),
                     },
                     Field {
                         label: "Word128Carrier".to_string(),
-                        ty: DeclarationId(2253),
+                        ty: DeclarationId(2257),
                     },
                     Field {
                         label: "TerminalCarrier".to_string(),
-                        ty: DeclarationId(2254),
+                        ty: DeclarationId(2258),
                     },
                 ],
             },
@@ -48387,21 +48467,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7234, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1463),
+            id: DeclarationId(1466),
             name: Some("IntegerOverflow".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TwoComplementWrap".to_string(),
-                        ty: DeclarationId(2255),
+                        ty: DeclarationId(2259),
                     },
                     Field {
                         label: "Saturating".to_string(),
-                        ty: DeclarationId(2256),
+                        ty: DeclarationId(2260),
                     },
                     Field {
                         label: "Trap".to_string(),
-                        ty: DeclarationId(2257),
+                        ty: DeclarationId(2261),
                     },
                 ],
             },
@@ -48416,17 +48496,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8093, 8159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1464),
+            id: DeclarationId(1467),
             name: Some("RustPrimitive".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerPrimitive".to_string(),
-                        ty: DeclarationId(2258),
+                        ty: DeclarationId(2262),
                     },
                     Field {
                         label: "NonIntegerPrimitive".to_string(),
-                        ty: DeclarationId(2259),
+                        ty: DeclarationId(2263),
                     },
                 ],
             },
@@ -48441,94 +48521,94 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8914, 9696),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1465),
+            id: DeclarationId(1468),
             name: Some("rust_pilot_primitives".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1464),
+                    value: DeclarationId(1467),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2260)),
+            meta_tag: Some(DeclarationId(2264)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
                 FieldValue::Variant {
-                    constructor: DeclarationId(2258),
+                    constructor: DeclarationId(2262),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2244),
+                            constructor: DeclarationId(2248),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2249),
+                            constructor: DeclarationId(2253),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("-128".to_string())),
                         FieldValue::Literal(LiteralBits::String("127".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2255),
+                            constructor: DeclarationId(2259),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2258),
+                    constructor: DeclarationId(2262),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2244),
+                            constructor: DeclarationId(2248),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2250),
+                            constructor: DeclarationId(2254),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("-32768".to_string())),
                         FieldValue::Literal(LiteralBits::String("32767".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2255),
+                            constructor: DeclarationId(2259),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2258),
+                    constructor: DeclarationId(2262),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2244),
+                            constructor: DeclarationId(2248),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2251),
+                            constructor: DeclarationId(2255),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("-2147483648".to_string())),
                         FieldValue::Literal(LiteralBits::String("2147483647".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2255),
+                            constructor: DeclarationId(2259),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2258),
+                    constructor: DeclarationId(2262),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2244),
+                            constructor: DeclarationId(2248),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2252),
+                            constructor: DeclarationId(2256),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -48537,21 +48617,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2255),
+                            constructor: DeclarationId(2259),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2258),
+                    constructor: DeclarationId(2262),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2244),
+                            constructor: DeclarationId(2248),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2253),
+                            constructor: DeclarationId(2257),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -48562,84 +48642,84 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2255),
+                            constructor: DeclarationId(2259),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2258),
+                    constructor: DeclarationId(2262),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2245),
+                            constructor: DeclarationId(2249),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2249),
+                            constructor: DeclarationId(2253),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("255".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2255),
+                            constructor: DeclarationId(2259),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2258),
+                    constructor: DeclarationId(2262),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2245),
+                            constructor: DeclarationId(2249),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2250),
+                            constructor: DeclarationId(2254),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("65535".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2255),
+                            constructor: DeclarationId(2259),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2258),
+                    constructor: DeclarationId(2262),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2245),
+                            constructor: DeclarationId(2249),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2251),
+                            constructor: DeclarationId(2255),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("4294967295".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2255),
+                            constructor: DeclarationId(2259),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2258),
+                    constructor: DeclarationId(2262),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2245),
+                            constructor: DeclarationId(2249),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2252),
+                            constructor: DeclarationId(2256),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -48648,36 +48728,36 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2255),
+                            constructor: DeclarationId(2259),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2259),
+                    constructor: DeclarationId(2263),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("bool".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2246),
+                            constructor: DeclarationId(2250),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2248),
+                            constructor: DeclarationId(2252),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2259),
+                    constructor: DeclarationId(2263),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("()".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2247),
+                            constructor: DeclarationId(2251),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2254),
+                            constructor: DeclarationId(2258),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -48689,7 +48769,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9996, 13318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1466),
+            id: DeclarationId(1469),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -48709,7 +48789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3259, 3272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1467),
+            id: DeclarationId(1470),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -48729,7 +48809,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3421, 3434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1468),
+            id: DeclarationId(1471),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -48749,7 +48829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3439, 3452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1469),
+            id: DeclarationId(1472),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -48769,7 +48849,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3556, 3569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1470),
+            id: DeclarationId(1473),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -48789,7 +48869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4162, 4169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1471),
+            id: DeclarationId(1474),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(614), DeclarationId(613)],
@@ -48807,7 +48887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1472),
+            id: DeclarationId(1475),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -48827,7 +48907,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4617, 4624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1473),
+            id: DeclarationId(1476),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(616), DeclarationId(617)],
@@ -48845,7 +48925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4638, 4651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1474),
+            id: DeclarationId(1477),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -48865,7 +48945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5336, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1475),
+            id: DeclarationId(1478),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -48885,7 +48965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5354, 5367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1476),
+            id: DeclarationId(1479),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -48905,7 +48985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5372, 5385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1477),
+            id: DeclarationId(1480),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -48925,7 +49005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5686, 5693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1478),
+            id: DeclarationId(1481),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(621)],
@@ -48943,7 +49023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5698, 5708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1479),
+            id: DeclarationId(1482),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -48963,7 +49043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5713, 5720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1480),
+            id: DeclarationId(1483),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -48983,7 +49063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5867, 5874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1481),
+            id: DeclarationId(1484),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(624)],
@@ -49001,7 +49081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1482),
+            id: DeclarationId(1485),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49021,7 +49101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5897, 5904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1483),
+            id: DeclarationId(1486),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49041,7 +49121,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6130, 6137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1484),
+            id: DeclarationId(1487),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49061,11 +49141,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6151, 6158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1485),
+            id: DeclarationId(1488),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(626)],
-                output: DeclarationId(1484),
+                output: DeclarationId(1487),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -49079,7 +49159,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6142, 6158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1486),
+            id: DeclarationId(1489),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49099,7 +49179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6163, 6170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1487),
+            id: DeclarationId(1490),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49119,7 +49199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6356, 6363),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1488),
+            id: DeclarationId(1491),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49139,7 +49219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6588, 6595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1489),
+            id: DeclarationId(1492),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49159,7 +49239,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7202, 7209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1490),
+            id: DeclarationId(1493),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(632),
@@ -49179,13 +49259,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7219, 7236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1491),
+            id: DeclarationId(1494),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1490),
+                    value: DeclarationId(1493),
                 }],
             },
             type_params: vec![],
@@ -49199,7 +49279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7214, 7237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1492),
+            id: DeclarationId(1495),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49219,7 +49299,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7415, 7422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1493),
+            id: DeclarationId(1496),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(632),
@@ -49239,13 +49319,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7444, 7461),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1494),
+            id: DeclarationId(1497),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1493),
+                    value: DeclarationId(1496),
                 }],
             },
             type_params: vec![],
@@ -49259,7 +49339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7439, 7462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1495),
+            id: DeclarationId(1498),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49279,7 +49359,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 8177, 8184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1496),
+            id: DeclarationId(1499),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49293,7 +49373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2106, 2111),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1497),
+            id: DeclarationId(1500),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49313,7 +49393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2144, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1498),
+            id: DeclarationId(1501),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49323,7 +49403,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "tail".to_string(),
-                        ty: DeclarationId(1497),
+                        ty: DeclarationId(1500),
                     },
                 ],
             },
@@ -49338,7 +49418,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2116, 2159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1499),
+            id: DeclarationId(1502),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49358,7 +49438,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1477, 1490),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1500),
+            id: DeclarationId(1503),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49378,7 +49458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1570, 1583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1501),
+            id: DeclarationId(1504),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(197),
@@ -49395,7 +49475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1502),
+            id: DeclarationId(1505),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(729),
@@ -49415,7 +49495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20916, 20943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1503),
+            id: DeclarationId(1506),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(632),
@@ -49435,7 +49515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20995, 21026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1504),
+            id: DeclarationId(1507),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(729),
@@ -49455,10 +49535,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1505),
+            id: DeclarationId(1508),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(1504),
+                DeclarationId(1507),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -49472,7 +49552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1506),
+            id: DeclarationId(1509),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49492,7 +49572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21185, 21206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1507),
+            id: DeclarationId(1510),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(729),
@@ -49512,10 +49592,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1508),
+            id: DeclarationId(1511),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(1507),
+                DeclarationId(1510),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -49529,7 +49609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1509),
+            id: DeclarationId(1512),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49549,7 +49629,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 22268, 22289),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1510),
+            id: DeclarationId(1513),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(167),
@@ -49566,7 +49646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1511),
+            id: DeclarationId(1514),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(197),
@@ -49583,7 +49663,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1512),
+            id: DeclarationId(1515),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(197),
@@ -49600,7 +49680,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1513),
+            id: DeclarationId(1516),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49620,7 +49700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 37237, 37258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1514),
+            id: DeclarationId(1517),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49640,7 +49720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 37264, 37295),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1515),
+            id: DeclarationId(1518),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49659,7 +49739,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7532, 7561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1516),
+            id: DeclarationId(1519),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49678,7 +49758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7566, 7595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1517),
+            id: DeclarationId(1520),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49698,7 +49778,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7627, 7645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1518),
+            id: DeclarationId(1521),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49718,12 +49798,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8066, 8084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1519),
+            id: DeclarationId(1522),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1518),
+                    ty: DeclarationId(1521),
                 }],
             },
             type_params: vec![],
@@ -49737,7 +49817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8036, 8086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1520),
+            id: DeclarationId(1523),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49762,7 +49842,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8091, 8147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1521),
+            id: DeclarationId(1524),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49781,7 +49861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8510, 8555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1522),
+            id: DeclarationId(1525),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49810,7 +49890,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8560, 8630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1523),
+            id: DeclarationId(1526),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49824,7 +49904,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14355, 14365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1524),
+            id: DeclarationId(1527),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49843,7 +49923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14370, 14408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1525),
+            id: DeclarationId(1528),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49862,7 +49942,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14413, 14451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1526),
+            id: DeclarationId(1529),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49881,7 +49961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14697, 14732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1527),
+            id: DeclarationId(1530),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49895,7 +49975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14737, 14749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1528),
+            id: DeclarationId(1531),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49914,7 +49994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15171, 15200),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1529),
+            id: DeclarationId(1532),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49933,7 +50013,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15205, 15230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1530),
+            id: DeclarationId(1533),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49947,7 +50027,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15743, 15753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1531),
+            id: DeclarationId(1534),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49966,7 +50046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15758, 15796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1532),
+            id: DeclarationId(1535),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49985,7 +50065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16501, 16528),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1533),
+            id: DeclarationId(1536),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50004,7 +50084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16533, 16561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1534),
+            id: DeclarationId(1537),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -50024,12 +50104,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16589, 16601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1535),
+            id: DeclarationId(1538),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1534),
+                    ty: DeclarationId(1537),
                 }],
             },
             type_params: vec![],
@@ -50043,7 +50123,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16566, 16603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1536),
+            id: DeclarationId(1539),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50057,7 +50137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 17280, 17293),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1537),
+            id: DeclarationId(1540),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50071,7 +50151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 17298, 17312),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1538),
+            id: DeclarationId(1541),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50090,7 +50170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 17317, 17349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1539),
+            id: DeclarationId(1542),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50109,7 +50189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 19519, 19560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1540),
+            id: DeclarationId(1543),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -50134,7 +50214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 19565, 19634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1541),
+            id: DeclarationId(1544),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -50171,7 +50251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 19639, 19789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1542),
+            id: DeclarationId(1545),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50185,7 +50265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20538, 20559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1543),
+            id: DeclarationId(1546),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(729),
@@ -50205,12 +50285,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20590, 20617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1544),
+            id: DeclarationId(1547),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "first_breaker".to_string(),
-                    ty: DeclarationId(1543),
+                    ty: DeclarationId(1546),
                 }],
             },
             type_params: vec![],
@@ -50224,7 +50304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20564, 20619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1545),
+            id: DeclarationId(1548),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -50244,12 +50324,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24543, 24564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1546),
+            id: DeclarationId(1549),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ops".to_string(),
-                    ty: DeclarationId(1545),
+                    ty: DeclarationId(1548),
                 }],
             },
             type_params: vec![],
@@ -50263,7 +50343,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24523, 24566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1547),
+            id: DeclarationId(1550),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(646),
@@ -50283,12 +50363,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24592, 24619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1548),
+            id: DeclarationId(1551),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "arms".to_string(),
-                    ty: DeclarationId(1547),
+                    ty: DeclarationId(1550),
                 }],
             },
             type_params: vec![],
@@ -50302,7 +50382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24571, 24621),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1549),
+            id: DeclarationId(1552),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50321,7 +50401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24626, 24661),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1550),
+            id: DeclarationId(1553),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(646),
@@ -50341,12 +50421,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24693, 24725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1551),
+            id: DeclarationId(1554),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "branches".to_string(),
-                    ty: DeclarationId(1550),
+                    ty: DeclarationId(1553),
                 }],
             },
             type_params: vec![],
@@ -50360,7 +50440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24666, 24727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1552),
+            id: DeclarationId(1555),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50379,7 +50459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25364, 25410),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1553),
+            id: DeclarationId(1556),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50398,7 +50478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25415, 25467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1554),
+            id: DeclarationId(1557),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50412,7 +50492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25964, 25984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1555),
+            id: DeclarationId(1558),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50426,7 +50506,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25989, 26010),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1556),
+            id: DeclarationId(1559),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50440,7 +50520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26015, 26038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1557),
+            id: DeclarationId(1560),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50454,7 +50534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26043, 26061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1558),
+            id: DeclarationId(1561),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50468,7 +50548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26066, 26084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1559),
+            id: DeclarationId(1562),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50487,7 +50567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26401, 26447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1560),
+            id: DeclarationId(1563),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50506,7 +50586,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26452, 26504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1561),
+            id: DeclarationId(1564),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50520,7 +50600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 33114, 33120),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1562),
+            id: DeclarationId(1565),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50539,7 +50619,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 33125, 33162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1563),
+            id: DeclarationId(1566),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50558,7 +50638,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 33167, 33204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1564),
+            id: DeclarationId(1567),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50572,7 +50652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 33678, 33697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1565),
+            id: DeclarationId(1568),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50591,7 +50671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 33702, 33751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1566),
+            id: DeclarationId(1569),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(699),
@@ -50608,7 +50688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18570, 18578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1567),
+            id: DeclarationId(1570),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(743),
@@ -50625,7 +50705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18627, 18636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1568),
+            id: DeclarationId(1571),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(743),
@@ -50642,7 +50722,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18702, 18711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1569),
+            id: DeclarationId(1572),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(716),
@@ -50659,7 +50739,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19088, 19100),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1570),
+            id: DeclarationId(1573),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(673),
@@ -50676,12 +50756,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19409, 19424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1571),
+            id: DeclarationId(1574),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(993),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(991),
+                    parameter: DeclarationId(994),
                     value: DeclarationId(642),
                 }],
             },
@@ -50696,12 +50776,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 23408, 23429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1572),
+            id: DeclarationId(1575),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(993),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(991),
+                    parameter: DeclarationId(994),
                     value: DeclarationId(642),
                 }],
             },
@@ -50716,7 +50796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 23493, 23514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1573),
+            id: DeclarationId(1576),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50730,7 +50810,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 479, 489),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1574),
+            id: DeclarationId(1577),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50749,7 +50829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 494, 513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1575),
+            id: DeclarationId(1578),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50763,7 +50843,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 518, 528),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1576),
+            id: DeclarationId(1579),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(640),
@@ -50780,7 +50860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1577),
+            id: DeclarationId(1580),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50799,7 +50879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 791, 802),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1578),
+            id: DeclarationId(1581),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50818,7 +50898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 807, 820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1579),
+            id: DeclarationId(1582),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50837,7 +50917,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 825, 842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1580),
+            id: DeclarationId(1583),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50856,7 +50936,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 2873, 2893),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1581),
+            id: DeclarationId(1584),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50875,7 +50955,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 2898, 2926),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1582),
+            id: DeclarationId(1585),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50894,7 +50974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 2931, 2965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1583),
+            id: DeclarationId(1586),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50913,7 +50993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 2970, 2999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1584),
+            id: DeclarationId(1587),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50932,7 +51012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3004, 3021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1585),
+            id: DeclarationId(1588),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50946,7 +51026,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3625, 3632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1586),
+            id: DeclarationId(1589),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50965,7 +51045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3637, 3687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1587),
+            id: DeclarationId(1590),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50984,7 +51064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 5251, 5275),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1588),
+            id: DeclarationId(1591),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50998,7 +51078,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 5300, 5309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1589),
+            id: DeclarationId(1592),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51017,7 +51097,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 5314, 5350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1590),
+            id: DeclarationId(1593),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -51042,7 +51122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 5662, 5712),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1591),
+            id: DeclarationId(1594),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51056,7 +51136,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 5717, 5726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1592),
+            id: DeclarationId(1595),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(704),
@@ -51076,12 +51156,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6302, 6315),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1593),
+            id: DeclarationId(1596),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1592),
+                    ty: DeclarationId(1595),
                 }],
             },
             type_params: vec![],
@@ -51095,7 +51175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6290, 6316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1594),
+            id: DeclarationId(1597),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51109,7 +51189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6321, 6338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1595),
+            id: DeclarationId(1598),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51128,7 +51208,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6589, 6599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1596),
+            id: DeclarationId(1599),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51142,7 +51222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6604, 6613),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1597),
+            id: DeclarationId(1600),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51156,7 +51236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6618, 6627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1598),
+            id: DeclarationId(1601),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51175,7 +51255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7054, 7074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1599),
+            id: DeclarationId(1602),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51194,7 +51274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7079, 7103),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1600),
+            id: DeclarationId(1603),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -51214,12 +51294,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7115, 7131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1601),
+            id: DeclarationId(1604),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1600),
+                    ty: DeclarationId(1603),
                 }],
             },
             type_params: vec![],
@@ -51233,7 +51313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7108, 7132),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1602),
+            id: DeclarationId(1605),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -51253,12 +51333,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7142, 7158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1603),
+            id: DeclarationId(1606),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1602),
+                    ty: DeclarationId(1605),
                 }],
             },
             type_params: vec![],
@@ -51272,7 +51352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7137, 7159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1604),
+            id: DeclarationId(1607),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -51292,12 +51372,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7168, 7184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1605),
+            id: DeclarationId(1608),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1604),
+                    ty: DeclarationId(1607),
                 }],
             },
             type_params: vec![],
@@ -51311,7 +51391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7164, 7185),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1606),
+            id: DeclarationId(1609),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -51331,7 +51411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7248, 7264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1607),
+            id: DeclarationId(1610),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -51341,7 +51421,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(1606),
+                        ty: DeclarationId(1609),
                     },
                 ],
             },
@@ -51356,7 +51436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7190, 7270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1608),
+            id: DeclarationId(1611),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51375,7 +51455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7429, 7458),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1609),
+            id: DeclarationId(1612),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -51395,12 +51475,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7493, 7509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1610),
+            id: DeclarationId(1613),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1609),
+                    ty: DeclarationId(1612),
                 }],
             },
             type_params: vec![],
@@ -51414,7 +51494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7463, 7511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1611),
+            id: DeclarationId(1614),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -51434,12 +51514,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7529, 7545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1612),
+            id: DeclarationId(1615),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1611),
+                    ty: DeclarationId(1614),
                 }],
             },
             type_params: vec![],
@@ -51453,7 +51533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7516, 7546),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1613),
+            id: DeclarationId(1616),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51472,7 +51552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7881, 7900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1614),
+            id: DeclarationId(1617),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51491,7 +51571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7905, 7939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1615),
+            id: DeclarationId(1618),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51505,7 +51585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7944, 7951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1616),
+            id: DeclarationId(1619),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51519,7 +51599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7956, 7962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1617),
+            id: DeclarationId(1620),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51538,7 +51618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7967, 7987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1618),
+            id: DeclarationId(1621),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51557,7 +51637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8216, 8233),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1619),
+            id: DeclarationId(1622),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -51577,12 +51657,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8255, 8270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1620),
+            id: DeclarationId(1623),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "children".to_string(),
-                    ty: DeclarationId(1619),
+                    ty: DeclarationId(1622),
                 }],
             },
             type_params: vec![],
@@ -51596,7 +51676,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8238, 8272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1621),
+            id: DeclarationId(1624),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -51616,12 +51696,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8294, 8309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1622),
+            id: DeclarationId(1625),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "variants".to_string(),
-                    ty: DeclarationId(1621),
+                    ty: DeclarationId(1624),
                 }],
             },
             type_params: vec![],
@@ -51635,7 +51715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8277, 8311),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1623),
+            id: DeclarationId(1626),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -51655,13 +51735,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8338, 8357),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1624),
+            id: DeclarationId(1627),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1623),
+                        ty: DeclarationId(1626),
                     },
                     Field {
                         label: "output".to_string(),
@@ -51684,7 +51764,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8316, 8413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1625),
+            id: DeclarationId(1628),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -51709,7 +51789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8418, 8496),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1626),
+            id: DeclarationId(1629),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -51729,7 +51809,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8564, 8586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1627),
+            id: DeclarationId(1630),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -51739,7 +51819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "arguments".to_string(),
-                        ty: DeclarationId(1626),
+                        ty: DeclarationId(1629),
                     },
                 ],
             },
@@ -51754,7 +51834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8501, 8592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1628),
+            id: DeclarationId(1631),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(197),
@@ -51771,7 +51851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8641, 8648),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1629),
+            id: DeclarationId(1632),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -51791,7 +51871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8693, 8712),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1630),
+            id: DeclarationId(1633),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -51811,7 +51891,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8731, 8753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1631),
+            id: DeclarationId(1634),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(642),
@@ -51828,7 +51908,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8766, 8780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1632),
+            id: DeclarationId(1635),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(642),
@@ -51845,7 +51925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8793, 8807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1633),
+            id: DeclarationId(1636),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(713),
@@ -51862,7 +51942,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8822, 8832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1634),
+            id: DeclarationId(1637),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(718),
@@ -51879,7 +51959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8852, 8867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1635),
+            id: DeclarationId(1638),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -51899,7 +51979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9990, 10009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1636),
+            id: DeclarationId(1639),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51913,7 +51993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 10290, 10293),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1637),
+            id: DeclarationId(1640),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51927,7 +52007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 10298, 10301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1638),
+            id: DeclarationId(1641),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51941,7 +52021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 10306, 10309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1639),
+            id: DeclarationId(1642),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51955,7 +52035,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 10314, 10317),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1640),
+            id: DeclarationId(1643),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51969,7 +52049,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 10441, 10443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1641),
+            id: DeclarationId(1644),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51983,7 +52063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 10448, 10450),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1642),
+            id: DeclarationId(1645),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51997,7 +52077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 10455, 10457),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1643),
+            id: DeclarationId(1646),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52011,7 +52091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 10462, 10464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1644),
+            id: DeclarationId(1647),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52025,7 +52105,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 10469, 10471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1645),
+            id: DeclarationId(1648),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52039,7 +52119,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 10476, 10478),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1646),
+            id: DeclarationId(1649),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52053,7 +52133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 10731, 10734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1647),
+            id: DeclarationId(1650),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52067,7 +52147,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 10739, 10741),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1648),
+            id: DeclarationId(1651),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52086,7 +52166,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 10977, 11001),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1649),
+            id: DeclarationId(1652),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52105,7 +52185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11006, 11030),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1650),
+            id: DeclarationId(1653),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52124,7 +52204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11035, 11053),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1651),
+            id: DeclarationId(1654),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52143,7 +52223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11240, 11263),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1652),
+            id: DeclarationId(1655),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(642),
@@ -52160,7 +52240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11328, 11342),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1653),
+            id: DeclarationId(1656),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52170,7 +52250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "field_child".to_string(),
-                        ty: DeclarationId(1652),
+                        ty: DeclarationId(1655),
                     },
                 ],
             },
@@ -52185,7 +52265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11268, 11348),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1654),
+            id: DeclarationId(1657),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52204,7 +52284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11353, 11375),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1655),
+            id: DeclarationId(1658),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52229,7 +52309,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11500, 11552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1656),
+            id: DeclarationId(1659),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52248,7 +52328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11557, 11587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1657),
+            id: DeclarationId(1660),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(725),
@@ -52265,7 +52345,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11751, 11766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1658),
+            id: DeclarationId(1661),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(646),
@@ -52285,7 +52365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13742, 13773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1659),
+            id: DeclarationId(1662),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(644),
@@ -52305,7 +52385,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13797, 13827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1660),
+            id: DeclarationId(1663),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52324,7 +52404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14450, 14479),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1661),
+            id: DeclarationId(1664),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52349,7 +52429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14484, 14531),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1662),
+            id: DeclarationId(1665),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(673),
@@ -52366,7 +52446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14800, 14815),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1663),
+            id: DeclarationId(1666),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -52386,7 +52466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14889, 14901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1664),
+            id: DeclarationId(1667),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52400,7 +52480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15142, 15151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1665),
+            id: DeclarationId(1668),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -52420,7 +52500,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15209, 15225),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1666),
+            id: DeclarationId(1669),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(738),
@@ -52437,7 +52517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15289, 15313),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1667),
+            id: DeclarationId(1670),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52451,7 +52531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15727, 15739),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1668),
+            id: DeclarationId(1671),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -52471,7 +52551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15817, 15829),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1669),
+            id: DeclarationId(1672),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(673),
@@ -52488,7 +52568,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15867, 15882),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1670),
+            id: DeclarationId(1673),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(741),
@@ -52505,7 +52585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15905, 15927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1671),
+            id: DeclarationId(1674),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52524,7 +52604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 16019, 16035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1672),
+            id: DeclarationId(1675),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52543,7 +52623,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 16040, 16064),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1673),
+            id: DeclarationId(1676),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52562,7 +52642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 16069, 16087),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1674),
+            id: DeclarationId(1677),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52581,7 +52661,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 16092, 16106),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1675),
+            id: DeclarationId(1678),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52600,7 +52680,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 16111, 16125),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1676),
+            id: DeclarationId(1679),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -52620,7 +52700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 16154, 16171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1677),
+            id: DeclarationId(1680),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -52640,7 +52720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 16181, 16195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1678),
+            id: DeclarationId(1681),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -52660,7 +52740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 16205, 16218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1679),
+            id: DeclarationId(1682),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -52680,7 +52760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 16231, 16244),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1680),
+            id: DeclarationId(1683),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52699,7 +52779,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 21450, 21468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1681),
+            id: DeclarationId(1684),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52713,7 +52793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 21473, 21479),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1682),
+            id: DeclarationId(1685),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(646),
@@ -52733,12 +52813,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 21512, 21536),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1683),
+            id: DeclarationId(1686),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "candidates".to_string(),
-                    ty: DeclarationId(1682),
+                    ty: DeclarationId(1685),
                 }],
             },
             type_params: vec![],
@@ -52752,12 +52832,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 21484, 21538),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1684),
+            id: DeclarationId(1687),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(993),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(991),
+                    parameter: DeclarationId(994),
                     value: DeclarationId(762),
                 }],
             },
@@ -52772,12 +52852,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9849, 9869),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1685),
+            id: DeclarationId(1688),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(993),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(991),
+                    parameter: DeclarationId(994),
                     value: DeclarationId(762),
                 }],
             },
@@ -52792,7 +52872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9933, 9953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1686),
+            id: DeclarationId(1689),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(646),
@@ -52812,7 +52892,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 10021, 10051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1687),
+            id: DeclarationId(1690),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -52832,7 +52912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 10518, 10536),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1688),
+            id: DeclarationId(1691),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(646),
@@ -52852,7 +52932,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 10542, 10572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1689),
+            id: DeclarationId(1692),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -52872,7 +52952,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 13069, 13087),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1690),
+            id: DeclarationId(1693),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(646),
@@ -52892,7 +52972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 17290, 17320),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1691),
+            id: DeclarationId(1694),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -52912,7 +52992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 17325, 17343),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1692),
+            id: DeclarationId(1695),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -52932,7 +53012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 17594, 17612),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1693),
+            id: DeclarationId(1696),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -52952,7 +53032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 17617, 17635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1694),
+            id: DeclarationId(1697),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -52972,7 +53052,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18901, 18919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1695),
+            id: DeclarationId(1698),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -52992,7 +53072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 19172, 19190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1696),
+            id: DeclarationId(1699),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -53012,7 +53092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 19638, 19656),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1697),
+            id: DeclarationId(1700),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -53032,7 +53112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 21673, 21691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1698),
+            id: DeclarationId(1701),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -53052,7 +53132,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 21721, 21739),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1699),
+            id: DeclarationId(1702),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -53072,7 +53152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22026, 22044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1700),
+            id: DeclarationId(1703),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -53092,7 +53172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22072, 22090),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1701),
+            id: DeclarationId(1704),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -53112,7 +53192,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22450, 22468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1702),
+            id: DeclarationId(1705),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -53132,7 +53212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22473, 22491),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1703),
+            id: DeclarationId(1706),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53146,7 +53226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4805, 4817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1704),
+            id: DeclarationId(1707),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53160,7 +53240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4822, 4838),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1705),
+            id: DeclarationId(1708),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53174,7 +53254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4843, 4857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1706),
+            id: DeclarationId(1709),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53188,7 +53268,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5707, 5720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1707),
+            id: DeclarationId(1710),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53202,7 +53282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5725, 5740),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1708),
+            id: DeclarationId(1711),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53216,7 +53296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5745, 5761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1709),
+            id: DeclarationId(1712),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53230,7 +53310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5766, 5779),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1710),
+            id: DeclarationId(1713),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(757),
@@ -53247,7 +53327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6632, 6653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1711),
+            id: DeclarationId(1714),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(758),
@@ -53264,7 +53344,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6668, 6678),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1712),
+            id: DeclarationId(1715),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -53281,7 +53361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6708, 6712),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1713),
+            id: DeclarationId(1716),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53295,7 +53375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8181, 8190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1714),
+            id: DeclarationId(1717),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53314,7 +53394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8195, 8241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1715),
+            id: DeclarationId(1718),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53333,7 +53413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8413, 8430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1716),
+            id: DeclarationId(1719),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53352,7 +53432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8435, 8459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1717),
+            id: DeclarationId(1720),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -53377,7 +53457,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8464, 8526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1718),
+            id: DeclarationId(1721),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(646),
@@ -53397,12 +53477,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8543, 8573),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1719),
+            id: DeclarationId(1722),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1718),
+                    ty: DeclarationId(1721),
                 }],
             },
             type_params: vec![],
@@ -53416,7 +53496,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8531, 8574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1720),
+            id: DeclarationId(1723),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(646),
@@ -53436,12 +53516,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8587, 8617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1721),
+            id: DeclarationId(1724),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1720),
+                    ty: DeclarationId(1723),
                 }],
             },
             type_params: vec![],
@@ -53455,7 +53535,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8579, 8618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1722),
+            id: DeclarationId(1725),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53474,7 +53554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8623, 8644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1723),
+            id: DeclarationId(1726),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53493,7 +53573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8649, 8668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1724),
+            id: DeclarationId(1727),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(610),
@@ -53513,7 +53593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 10402, 10414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1725),
+            id: DeclarationId(1728),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(647)],
@@ -53531,7 +53611,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1726),
+            id: DeclarationId(1729),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(623),
@@ -53541,7 +53621,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(762),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1481),
+                        parameter: DeclarationId(1484),
                         value: DeclarationId(769),
                     },
                 ],
@@ -53557,7 +53637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 10395, 10442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1727),
+            id: DeclarationId(1730),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(610),
@@ -53577,7 +53657,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 10702, 10717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1728),
+            id: DeclarationId(1731),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(762), DeclarationId(762)],
@@ -53595,7 +53675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1729),
+            id: DeclarationId(1732),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(612),
@@ -53609,7 +53689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(762),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1471),
+                        parameter: DeclarationId(1474),
                         value: DeclarationId(773),
                     },
                 ],
@@ -53625,7 +53705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 13109, 13152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1730),
+            id: DeclarationId(1733),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(763), DeclarationId(613)],
@@ -53643,7 +53723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1731),
+            id: DeclarationId(1734),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(612),
@@ -53653,7 +53733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(763),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1471),
+                        parameter: DeclarationId(1474),
                         value: DeclarationId(790),
                     },
                     TemplateArgument {
@@ -53673,7 +53753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 15818, 15928),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1732),
+            id: DeclarationId(1735),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(763), DeclarationId(613)],
@@ -53691,7 +53771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1733),
+            id: DeclarationId(1736),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(612),
@@ -53701,7 +53781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(763),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1471),
+                        parameter: DeclarationId(1474),
                         value: DeclarationId(790),
                     },
                     TemplateArgument {
@@ -53721,7 +53801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 15983, 16093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1734),
+            id: DeclarationId(1737),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -53741,7 +53821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 17366, 17396),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1735),
+            id: DeclarationId(1738),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -53761,7 +53841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 17348, 17397),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1736),
+            id: DeclarationId(1739),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -53781,7 +53861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 17667, 17674),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1737),
+            id: DeclarationId(1740),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -53801,7 +53881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 17792, 17835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1738),
+            id: DeclarationId(1741),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -53821,7 +53901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 19105, 19137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1739),
+            id: DeclarationId(1742),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -53841,7 +53921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 21776, 21783),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1740),
+            id: DeclarationId(1743),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -53861,7 +53941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 21924, 21989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1741),
+            id: DeclarationId(1744),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(763), DeclarationId(762)],
@@ -53879,7 +53959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1742),
+            id: DeclarationId(1745),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(612),
@@ -53893,7 +53973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(762),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1471),
+                        parameter: DeclarationId(1474),
                         value: DeclarationId(790),
                     },
                 ],
@@ -53909,7 +53989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22107, 22165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1743),
+            id: DeclarationId(1746),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -53929,7 +54009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22191, 22237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1744),
+            id: DeclarationId(1747),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -53949,11 +54029,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22508, 22515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1745),
+            id: DeclarationId(1748),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1702), DeclarationId(762)],
-                output: DeclarationId(1702),
+                inputs: vec![DeclarationId(1705), DeclarationId(762)],
+                output: DeclarationId(1705),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -53967,21 +54047,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1746),
+            id: DeclarationId(1749),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(612),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(614),
-                        value: DeclarationId(1702),
+                        value: DeclarationId(1705),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(613),
                         value: DeclarationId(762),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1471),
+                        parameter: DeclarationId(1474),
                         value: DeclarationId(793),
                     },
                 ],
@@ -53997,7 +54077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22496, 22537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1747),
+            id: DeclarationId(1750),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -54017,7 +54097,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4503, 4529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1748),
+            id: DeclarationId(1751),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(86),
@@ -54034,7 +54114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1749),
+            id: DeclarationId(1752),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(197),
@@ -54051,13 +54131,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1750),
+            id: DeclarationId(1753),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1024),
+                    value: DeclarationId(1027),
                 }],
             },
             type_params: vec![],
@@ -54071,7 +54151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6542, 6557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1751),
+            id: DeclarationId(1754),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -54091,12 +54171,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2549, 2580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1752),
+            id: DeclarationId(1755),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(1751),
+                    ty: DeclarationId(1754),
                 }],
             },
             type_params: vec![],
@@ -54110,7 +54190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2521, 2582),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1753),
+            id: DeclarationId(1756),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -54130,12 +54210,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2615, 2651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1754),
+            id: DeclarationId(1757),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(1753),
+                    ty: DeclarationId(1756),
                 }],
             },
             type_params: vec![],
@@ -54149,7 +54229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2587, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1755),
+            id: DeclarationId(1758),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54168,7 +54248,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3068, 3104),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1756),
+            id: DeclarationId(1759),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(99),
@@ -54185,7 +54265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3179, 3184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1757),
+            id: DeclarationId(1760),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54199,7 +54279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "is_error".to_string(),
-                        ty: DeclarationId(1756),
+                        ty: DeclarationId(1759),
                     },
                 ],
             },
@@ -54214,7 +54294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3109, 3186),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1758),
+            id: DeclarationId(1761),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54233,7 +54313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3633, 3671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1759),
+            id: DeclarationId(1762),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54262,7 +54342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3676, 3739),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1760),
+            id: DeclarationId(1763),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54276,7 +54356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4097, 4104),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1761),
+            id: DeclarationId(1764),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54290,7 +54370,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4109, 4118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1762),
+            id: DeclarationId(1765),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54304,7 +54384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4123, 4135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1763),
+            id: DeclarationId(1766),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54318,7 +54398,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4140, 4147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1764),
+            id: DeclarationId(1767),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54332,7 +54412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4152, 4161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1765),
+            id: DeclarationId(1768),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54346,7 +54426,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4166, 4173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1766),
+            id: DeclarationId(1769),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54360,7 +54440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4178, 4204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1767),
+            id: DeclarationId(1770),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -54380,7 +54460,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5538, 5573),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1768),
+            id: DeclarationId(1771),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(197),
@@ -54397,7 +54477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1769),
+            id: DeclarationId(1772),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54408,10 +54488,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 779, 792),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1207, 1220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1770),
+            id: DeclarationId(1773),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54422,10 +54502,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 797, 803),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1225, 1231),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1771),
+            id: DeclarationId(1774),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54436,10 +54516,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 808, 826),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1236, 1254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1772),
+            id: DeclarationId(1775),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54450,10 +54530,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 831, 849),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1259, 1277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1773),
+            id: DeclarationId(1776),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54464,10 +54544,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 854, 868),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1282, 1296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1774),
+            id: DeclarationId(1777),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54478,10 +54558,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1150, 1159),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1578, 1587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1775),
+            id: DeclarationId(1778),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54503,10 +54583,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1164, 1241),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1592, 1669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1776),
+            id: DeclarationId(1779),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54528,10 +54608,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1246, 1316),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1674, 1744),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1777),
+            id: DeclarationId(1780),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54542,10 +54622,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1518, 1523),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1946, 1951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1778),
+            id: DeclarationId(1781),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54556,10 +54636,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1526, 1534),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1954, 1962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1779),
+            id: DeclarationId(1782),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54570,10 +54650,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1537, 1557),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1965, 1985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1780),
+            id: DeclarationId(1783),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54584,10 +54664,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1769, 1779),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2197, 2207),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1781),
+            id: DeclarationId(1784),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54598,10 +54678,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1782, 1796),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2210, 2224),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1782),
+            id: DeclarationId(1785),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54612,10 +54692,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2013, 2025),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2441, 2453),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1783),
+            id: DeclarationId(1786),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54626,10 +54706,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2028, 2038),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2456, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1784),
+            id: DeclarationId(1787),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54640,10 +54720,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2258, 2270),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2686, 2698),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1785),
+            id: DeclarationId(1788),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54654,10 +54734,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2273, 2289),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2701, 2717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1786),
+            id: DeclarationId(1789),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54668,10 +54748,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2292, 2303),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2720, 2731),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1787),
+            id: DeclarationId(1790),
+            name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(39),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(40),
+                    value: DeclarationId(812),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3376, 3384),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1791),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54685,7 +54785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4314, 4321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1788),
+            id: DeclarationId(1792),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54699,13 +54799,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4326, 4330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1789),
+            id: DeclarationId(1793),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(813),
+                    value: DeclarationId(816),
                 }],
             },
             type_params: vec![],
@@ -54719,7 +54819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6578, 6599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1790),
+            id: DeclarationId(1794),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54733,7 +54833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2224, 2238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1791),
+            id: DeclarationId(1795),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54747,7 +54847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2243, 2268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1792),
+            id: DeclarationId(1796),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54761,7 +54861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2273, 2283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1793),
+            id: DeclarationId(1797),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54775,7 +54875,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2548, 2565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1794),
+            id: DeclarationId(1798),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54789,7 +54889,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2570, 2594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1795),
+            id: DeclarationId(1799),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54803,7 +54903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2599, 2631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1796),
+            id: DeclarationId(1800),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54817,7 +54917,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2636, 2663),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1797),
+            id: DeclarationId(1801),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54831,7 +54931,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3369, 3393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1798),
+            id: DeclarationId(1802),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54845,7 +54945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3398, 3430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1799),
+            id: DeclarationId(1803),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54859,7 +54959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3564, 3588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1800),
+            id: DeclarationId(1804),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54873,7 +54973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3593, 3614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1801),
+            id: DeclarationId(1805),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54887,7 +54987,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3619, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1802),
+            id: DeclarationId(1806),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54901,7 +55001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3781, 3796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1803),
+            id: DeclarationId(1807),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54915,7 +55015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3801, 3831),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1804),
+            id: DeclarationId(1808),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54929,7 +55029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3836, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1805),
+            id: DeclarationId(1809),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54943,7 +55043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4024, 4044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1806),
+            id: DeclarationId(1810),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54957,7 +55057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4049, 4076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1807),
+            id: DeclarationId(1811),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54971,7 +55071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4081, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1808),
+            id: DeclarationId(1812),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54985,7 +55085,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4354, 4362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1809),
+            id: DeclarationId(1813),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54999,7 +55099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4367, 4393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1810),
+            id: DeclarationId(1814),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55013,7 +55113,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4398, 4423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1811),
+            id: DeclarationId(1815),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -55033,7 +55133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5320, 5332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1812),
+            id: DeclarationId(1816),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55047,7 +55147,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5693, 5713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1813),
+            id: DeclarationId(1817),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55061,7 +55161,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5718, 5736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1814),
+            id: DeclarationId(1818),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55075,7 +55175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5741, 5759),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1815),
+            id: DeclarationId(1819),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55089,7 +55189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5764, 5791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1816),
+            id: DeclarationId(1820),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(197),
@@ -55106,7 +55206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5361, 5368),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1817),
+            id: DeclarationId(1821),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -55123,10 +55223,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6292, 6296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1818),
+            id: DeclarationId(1822),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(839),
+                DeclarationId(842),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -55140,10 +55240,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7350, 7369),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1819),
+            id: DeclarationId(1823),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(839),
+                DeclarationId(842),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -55157,7 +55257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7915, 7934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1820),
+            id: DeclarationId(1824),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55176,7 +55276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1356, 1388),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1821),
+            id: DeclarationId(1825),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55195,7 +55295,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1393, 1429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1822),
+            id: DeclarationId(1826),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55214,7 +55314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1434, 1471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1823),
+            id: DeclarationId(1827),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55233,7 +55333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1476, 1502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1824),
+            id: DeclarationId(1828),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55252,7 +55352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1507, 1540),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1825),
+            id: DeclarationId(1829),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55266,12 +55366,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1545, 1562),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1826),
+            id: DeclarationId(1830),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1033),
+                    ty: DeclarationId(1036),
                 }],
             },
             type_params: vec![],
@@ -55285,7 +55385,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1567, 1621),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1827),
+            id: DeclarationId(1831),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55299,7 +55399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1626, 1633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1828),
+            id: DeclarationId(1832),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55318,13 +55418,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2165, 2203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1829),
+            id: DeclarationId(1833),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "amount".to_string(),
-                        ty: DeclarationId(1033),
+                        ty: DeclarationId(1036),
                     },
                     Field {
                         label: "collection".to_string(),
@@ -55343,13 +55443,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2208, 2282),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1830),
+            id: DeclarationId(1834),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "steps".to_string(),
-                        ty: DeclarationId(1033),
+                        ty: DeclarationId(1036),
                     },
                     Field {
                         label: "ring_param".to_string(),
@@ -55368,13 +55468,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2287, 2362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1831),
+            id: DeclarationId(1835),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "divisor".to_string(),
-                        ty: DeclarationId(1034),
+                        ty: DeclarationId(1037),
                     },
                     Field {
                         label: "ring_param".to_string(),
@@ -55393,7 +55493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2367, 2440),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1832),
+            id: DeclarationId(1836),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55412,7 +55512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2445, 2482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1833),
+            id: DeclarationId(1837),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55431,7 +55531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2487, 2524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1834),
+            id: DeclarationId(1838),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55450,7 +55550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2529, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1835),
+            id: DeclarationId(1839),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55464,7 +55564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2575, 2591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1836),
+            id: DeclarationId(1840),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55478,12 +55578,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2803, 2813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1837),
+            id: DeclarationId(1841),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1033),
+                    ty: DeclarationId(1036),
                 }],
             },
             type_params: vec![],
@@ -55497,12 +55597,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2818, 2865),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1838),
+            id: DeclarationId(1842),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "divisor".to_string(),
-                    ty: DeclarationId(1034),
+                    ty: DeclarationId(1037),
                 }],
             },
             type_params: vec![],
@@ -55516,7 +55616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2870, 2921),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1839),
+            id: DeclarationId(1843),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55530,7 +55630,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3111, 3115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1840),
+            id: DeclarationId(1844),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55544,7 +55644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3120, 3127),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1841),
+            id: DeclarationId(1845),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55558,10 +55658,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3132, 3138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1842),
+            id: DeclarationId(1846),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(831),
+                DeclarationId(834),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -55575,7 +55675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3441, 3454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1843),
+            id: DeclarationId(1847),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55589,7 +55689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7082, 7093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1844),
+            id: DeclarationId(1848),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55603,7 +55703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7142, 7156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1845),
+            id: DeclarationId(1849),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55617,7 +55717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7221, 7237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1846),
+            id: DeclarationId(1850),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55631,7 +55731,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 360, 369),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1847),
+            id: DeclarationId(1851),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55645,7 +55745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 374, 381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1848),
+            id: DeclarationId(1852),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55659,7 +55759,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 614, 618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1849),
+            id: DeclarationId(1853),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55673,7 +55773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 623, 632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1850),
+            id: DeclarationId(1854),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55687,7 +55787,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 910, 921),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1851),
+            id: DeclarationId(1855),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55701,7 +55801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 926, 935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1852),
+            id: DeclarationId(1856),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55715,7 +55815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1166, 1173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1853),
+            id: DeclarationId(1857),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55729,7 +55829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1178, 1187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1854),
+            id: DeclarationId(1858),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55743,7 +55843,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2035, 2044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1855),
+            id: DeclarationId(1859),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55757,7 +55857,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2049, 2065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1856),
+            id: DeclarationId(1860),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55771,7 +55871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2070, 2080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1857),
+            id: DeclarationId(1861),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55785,7 +55885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2085, 2099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1858),
+            id: DeclarationId(1862),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55799,7 +55899,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2385, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1859),
+            id: DeclarationId(1863),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55813,7 +55913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2404, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1860),
+            id: DeclarationId(1864),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -55833,7 +55933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2818, 2830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1861),
+            id: DeclarationId(1865),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -55853,7 +55953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3210, 3222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1862),
+            id: DeclarationId(1866),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55867,7 +55967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3694, 3708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1863),
+            id: DeclarationId(1867),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55881,7 +55981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3713, 3729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1864),
+            id: DeclarationId(1868),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55895,7 +55995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1022, 1036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1865),
+            id: DeclarationId(1869),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55909,7 +56009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1041, 1051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1866),
+            id: DeclarationId(1870),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55923,7 +56023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1056, 1068),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1867),
+            id: DeclarationId(1871),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55937,7 +56037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1073, 1085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1868),
+            id: DeclarationId(1872),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55951,7 +56051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1090, 1103),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1869),
+            id: DeclarationId(1873),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55965,7 +56065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1108, 1120),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1870),
+            id: DeclarationId(1874),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55979,12 +56079,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1125, 1148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1871),
+            id: DeclarationId(1875),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(855),
+                    ty: DeclarationId(858),
                 }],
             },
             type_params: vec![],
@@ -55998,12 +56098,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5348, 5384),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1872),
+            id: DeclarationId(1876),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(858),
+                    ty: DeclarationId(861),
                 }],
             },
             type_params: vec![],
@@ -56017,13 +56117,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5389, 5430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1873),
+            id: DeclarationId(1877),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(856),
+                    value: DeclarationId(859),
                 }],
             },
             type_params: vec![],
@@ -56037,7 +56137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5889, 5905),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1874),
+            id: DeclarationId(1878),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56056,7 +56156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9017, 9058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1875),
+            id: DeclarationId(1879),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56070,7 +56170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9355, 9367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1876),
+            id: DeclarationId(1880),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -56090,7 +56190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9637, 9649),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1877),
+            id: DeclarationId(1881),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56100,7 +56200,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "sites".to_string(),
-                        ty: DeclarationId(1876),
+                        ty: DeclarationId(1880),
                     },
                 ],
             },
@@ -56115,7 +56215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9594, 9651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1878),
+            id: DeclarationId(1882),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56134,7 +56234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9961, 9995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1879),
+            id: DeclarationId(1883),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56153,7 +56253,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10398, 10449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1880),
+            id: DeclarationId(1884),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56167,7 +56267,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10792, 10810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1881),
+            id: DeclarationId(1885),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56195,104 +56295,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 11160, 11258),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(1882),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(37),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(38),
-                    value: DeclarationId(881),
-                }],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4196, 4216),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1883),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(869),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(870),
-                        value: DeclarationId(880),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(871),
-                        value: DeclarationId(881),
-                    },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4226, 4250),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1884),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(869),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(870),
-                        value: DeclarationId(880),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(871),
-                        value: DeclarationId(881),
-                    },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4261, 4285),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1885),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(869),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(870),
-                        value: DeclarationId(880),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(871),
-                        value: DeclarationId(881),
-                    },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4291, 4315),
-        });
         declarations.push(Declaration {
             id: DeclarationId(1886),
             name: None,
@@ -56311,20 +56313,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4392, 4412),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4196, 4216),
         });
         declarations.push(Declaration {
             id: DeclarationId(1887),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(869),
+                template: DeclarationId(872),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(870),
+                        parameter: DeclarationId(873),
                         value: DeclarationId(883),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(871),
+                        parameter: DeclarationId(874),
                         value: DeclarationId(884),
                     },
                 ],
@@ -56337,20 +56339,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4422, 4446),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4226, 4250),
         });
         declarations.push(Declaration {
             id: DeclarationId(1888),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(869),
+                template: DeclarationId(872),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(870),
+                        parameter: DeclarationId(873),
                         value: DeclarationId(883),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(871),
+                        parameter: DeclarationId(874),
                         value: DeclarationId(884),
                     },
                 ],
@@ -56363,20 +56365,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4457, 4481),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4261, 4285),
         });
         declarations.push(Declaration {
             id: DeclarationId(1889),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(869),
+                template: DeclarationId(872),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(870),
+                        parameter: DeclarationId(873),
                         value: DeclarationId(883),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(871),
+                        parameter: DeclarationId(874),
                         value: DeclarationId(884),
                     },
                 ],
@@ -56389,7 +56391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4487, 4511),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4291, 4315),
         });
         declarations.push(Declaration {
             id: DeclarationId(1890),
@@ -56409,20 +56411,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4595, 4615),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4392, 4412),
         });
         declarations.push(Declaration {
             id: DeclarationId(1891),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(869),
+                template: DeclarationId(872),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(870),
+                        parameter: DeclarationId(873),
                         value: DeclarationId(886),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(871),
+                        parameter: DeclarationId(874),
                         value: DeclarationId(887),
                     },
                 ],
@@ -56435,20 +56437,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4626, 4650),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4422, 4446),
         });
         declarations.push(Declaration {
             id: DeclarationId(1892),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(869),
+                template: DeclarationId(872),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(870),
+                        parameter: DeclarationId(873),
                         value: DeclarationId(886),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(871),
+                        parameter: DeclarationId(874),
                         value: DeclarationId(887),
                     },
                 ],
@@ -56461,11 +56463,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4675, 4699),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4457, 4481),
         });
         declarations.push(Declaration {
             id: DeclarationId(1893),
             name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(872),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(873),
+                        value: DeclarationId(886),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(874),
+                        value: DeclarationId(887),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4487, 4511),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1894),
+            name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
                 arguments: vec![TemplateArgument {
@@ -56481,20 +56509,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4790, 4810),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4595, 4615),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1894),
+            id: DeclarationId(1895),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(869),
+                template: DeclarationId(872),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(870),
+                        parameter: DeclarationId(873),
                         value: DeclarationId(889),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(871),
+                        parameter: DeclarationId(874),
                         value: DeclarationId(890),
                     },
                 ],
@@ -56507,20 +56535,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4821, 4845),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4626, 4650),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1895),
+            id: DeclarationId(1896),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(869),
+                template: DeclarationId(872),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(870),
+                        parameter: DeclarationId(873),
                         value: DeclarationId(889),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(871),
+                        parameter: DeclarationId(874),
                         value: DeclarationId(890),
                     },
                 ],
@@ -56533,15 +56561,87 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4675, 4699),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1897),
+            name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(37),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(38),
+                    value: DeclarationId(893),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4790, 4810),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1898),
+            name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(872),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(873),
+                        value: DeclarationId(892),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(874),
+                        value: DeclarationId(893),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4821, 4845),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1899),
+            name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(872),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(873),
+                        value: DeclarationId(892),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(874),
+                        value: DeclarationId(893),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4870, 4894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1896),
+            id: DeclarationId(1900),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(863),
+                    ty: DeclarationId(866),
                 }],
             },
             type_params: vec![],
@@ -56555,7 +56655,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1626, 1643),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1897),
+            id: DeclarationId(1901),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56580,7 +56680,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1648, 1689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1898),
+            id: DeclarationId(1902),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56594,12 +56694,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1871, 1883),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1899),
+            id: DeclarationId(1903),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "value".to_string(),
-                    ty: DeclarationId(860),
+                    ty: DeclarationId(863),
                 }],
             },
             type_params: vec![],
@@ -56613,13 +56713,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1888, 1924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1900),
+            id: DeclarationId(1904),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(862),
+                template: DeclarationId(865),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(863),
-                    value: DeclarationId(866),
+                    parameter: DeclarationId(866),
+                    value: DeclarationId(869),
                 }],
             },
             type_params: vec![],
@@ -56633,13 +56733,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2406, 2422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1901),
+            id: DeclarationId(1905),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1900),
+                    value: DeclarationId(1904),
                 }],
             },
             type_params: vec![],
@@ -56653,7 +56753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2401, 2423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1902),
+            id: DeclarationId(1906),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56663,11 +56763,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "composed".to_string(),
-                        ty: DeclarationId(866),
+                        ty: DeclarationId(869),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1901),
+                        ty: DeclarationId(1905),
                     },
                 ],
             },
@@ -56682,13 +56782,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2317, 2429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1903),
+            id: DeclarationId(1907),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(860),
+                    value: DeclarationId(863),
                 }],
             },
             type_params: vec![],
@@ -56702,13 +56802,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2497, 2513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1904),
+            id: DeclarationId(1908),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(862),
+                template: DeclarationId(865),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(863),
-                    value: DeclarationId(866),
+                    parameter: DeclarationId(866),
+                    value: DeclarationId(869),
                 }],
             },
             type_params: vec![],
@@ -56722,13 +56822,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2536, 2552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1905),
+            id: DeclarationId(1909),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1904),
+                    value: DeclarationId(1908),
                 }],
             },
             type_params: vec![],
@@ -56742,7 +56842,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2531, 2553),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1906),
+            id: DeclarationId(1910),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56752,11 +56852,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "violations".to_string(),
-                        ty: DeclarationId(1903),
+                        ty: DeclarationId(1907),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1905),
+                        ty: DeclarationId(1909),
                     },
                 ],
             },
@@ -56771,13 +56871,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2434, 2559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1907),
+            id: DeclarationId(1911),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(862),
+                template: DeclarationId(865),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(863),
-                    value: DeclarationId(868),
+                    parameter: DeclarationId(866),
+                    value: DeclarationId(871),
                 }],
             },
             type_params: vec![],
@@ -56791,11 +56891,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3216, 3232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1908),
+            id: DeclarationId(1912),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744), DeclarationId(743)],
-                output: DeclarationId(1907),
+                output: DeclarationId(1911),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -56809,11 +56909,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3195, 3232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1909),
+            id: DeclarationId(1913),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(868), DeclarationId(868)],
-                output: DeclarationId(868),
+                inputs: vec![DeclarationId(871), DeclarationId(871)],
+                output: DeclarationId(871),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -56827,11 +56927,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3244, 3275),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1910),
+            id: DeclarationId(1914),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(743), DeclarationId(868)],
-                output: DeclarationId(864),
+                inputs: vec![DeclarationId(743), DeclarationId(871)],
+                output: DeclarationId(867),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -56845,13 +56945,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3316, 3359),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1911),
+            id: DeclarationId(1915),
             name: Some("DimensionUnitAbelianGroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(25),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(26),
-                    value: DeclarationId(870),
+                    value: DeclarationId(873),
                 }],
             },
             type_params: vec![],
@@ -56865,13 +56965,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4002, 4052),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1912),
+            id: DeclarationId(1916),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(894),
+                    value: DeclarationId(897),
                 }],
             },
             type_params: vec![],
@@ -56885,7 +56985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1913),
+            id: DeclarationId(1917),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56899,7 +56999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4188, 4204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1914),
+            id: DeclarationId(1918),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56918,7 +57018,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4209, 4237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1915),
+            id: DeclarationId(1919),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56937,7 +57037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4727, 4746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1916),
+            id: DeclarationId(1920),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56956,13 +57056,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4751, 4773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1917),
+            id: DeclarationId(1921),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(899),
+                    value: DeclarationId(902),
                 }],
             },
             type_params: vec![],
@@ -56976,7 +57076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5142, 5165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1918),
+            id: DeclarationId(1922),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56990,7 +57090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6162, 6170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1919),
+            id: DeclarationId(1923),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57004,7 +57104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6175, 6183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1920),
+            id: DeclarationId(1924),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57018,7 +57118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1921),
+            id: DeclarationId(1925),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57032,7 +57132,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6634, 6642),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1922),
+            id: DeclarationId(1926),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57046,7 +57146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6978, 6991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1923),
+            id: DeclarationId(1927),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57060,7 +57160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6996, 7002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1924),
+            id: DeclarationId(1928),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57074,7 +57174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7260, 7268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1925),
+            id: DeclarationId(1929),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57088,7 +57188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7273, 7278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1926),
+            id: DeclarationId(1930),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57102,7 +57202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7283, 7296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1927),
+            id: DeclarationId(1931),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57116,7 +57216,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7633, 7651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1928),
+            id: DeclarationId(1932),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57130,7 +57230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8203, 8212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1929),
+            id: DeclarationId(1933),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57144,7 +57244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8217, 8230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1930),
+            id: DeclarationId(1934),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57158,7 +57258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8235, 8243),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1931),
+            id: DeclarationId(1935),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57172,7 +57272,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8248, 8258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1932),
+            id: DeclarationId(1936),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57186,7 +57286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8263, 8273),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1933),
+            id: DeclarationId(1937),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57200,7 +57300,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8278, 8289),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1934),
+            id: DeclarationId(1938),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57214,7 +57314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8294, 8302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1935),
+            id: DeclarationId(1939),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57228,7 +57328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8307, 8314),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1936),
+            id: DeclarationId(1940),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57242,7 +57342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8319, 8329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1937),
+            id: DeclarationId(1941),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57256,7 +57356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8334, 8346),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1938),
+            id: DeclarationId(1942),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57270,7 +57370,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11039, 11065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1939),
+            id: DeclarationId(1943),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57284,7 +57384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11070, 11080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1940),
+            id: DeclarationId(1944),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57298,7 +57398,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 14808, 14814),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1941),
+            id: DeclarationId(1945),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57312,7 +57412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 14819, 14830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1942),
+            id: DeclarationId(1946),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57326,7 +57426,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 15150, 15161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1943),
+            id: DeclarationId(1947),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57340,7 +57440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 15166, 15177),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1944),
+            id: DeclarationId(1948),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57354,7 +57454,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17110, 17121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1945),
+            id: DeclarationId(1949),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57368,7 +57468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17126, 17134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1946),
+            id: DeclarationId(1950),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57387,7 +57487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 18297, 18332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1947),
+            id: DeclarationId(1951),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57412,13 +57512,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 18337, 18425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1948),
+            id: DeclarationId(1952),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(928),
+                    value: DeclarationId(931),
                 }],
             },
             type_params: vec![],
@@ -57432,10 +57532,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 2458, 2486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1949),
+            id: DeclarationId(1953),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(830),
+                DeclarationId(833),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -57449,10 +57549,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 20442, 20454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1950),
+            id: DeclarationId(1954),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(833),
+                DeclarationId(836),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -57466,13 +57566,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 21827, 21842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1951),
+            id: DeclarationId(1955),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(950),
+                    value: DeclarationId(953),
                 }],
             },
             type_params: vec![],
@@ -57486,7 +57586,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27734, 27749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1952),
+            id: DeclarationId(1956),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -57503,7 +57603,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 31887, 31891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1953),
+            id: DeclarationId(1957),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -57520,7 +57620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 32183, 32187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1954),
+            id: DeclarationId(1958),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -57537,7 +57637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33432, 33436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1955),
+            id: DeclarationId(1959),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -57554,7 +57654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33907, 33911),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1956),
+            id: DeclarationId(1960),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -57571,7 +57671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35170, 35174),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1957),
+            id: DeclarationId(1961),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -57588,7 +57688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35442, 35446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1958),
+            id: DeclarationId(1962),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57602,7 +57702,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5562, 5577),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1959),
+            id: DeclarationId(1963),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57616,7 +57716,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5617, 5630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1960),
+            id: DeclarationId(1964),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57630,7 +57730,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5678, 5695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1961),
+            id: DeclarationId(1965),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57644,7 +57744,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5734, 5746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1962),
+            id: DeclarationId(1966),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57658,17 +57758,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5794, 5811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1963),
+            id: DeclarationId(1967),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "field".to_string(),
-                        ty: DeclarationId(934),
+                        ty: DeclarationId(937),
                     },
                     Field {
                         label: "factor".to_string(),
-                        ty: DeclarationId(831),
+                        ty: DeclarationId(834),
                     },
                 ],
             },
@@ -57683,12 +57783,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 9904, 9966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1964),
+            id: DeclarationId(1968),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "field".to_string(),
-                    ty: DeclarationId(934),
+                    ty: DeclarationId(937),
                 }],
             },
             type_params: vec![],
@@ -57702,7 +57802,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10013),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1965),
+            id: DeclarationId(1969),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57712,7 +57812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "factor".to_string(),
-                        ty: DeclarationId(831),
+                        ty: DeclarationId(834),
                     },
                 ],
             },
@@ -57727,7 +57827,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10018, 10075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1966),
+            id: DeclarationId(1970),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57741,7 +57841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10080, 10094),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1967),
+            id: DeclarationId(1971),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57755,7 +57855,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10099, 10114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1968),
+            id: DeclarationId(1972),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57769,12 +57869,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24019, 24033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1969),
+            id: DeclarationId(1973),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "degree".to_string(),
-                    ty: DeclarationId(1033),
+                    ty: DeclarationId(1036),
                 }],
             },
             type_params: vec![],
@@ -57788,17 +57888,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24038, 24085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1970),
+            id: DeclarationId(1974),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "numerator".to_string(),
-                        ty: DeclarationId(1033),
+                        ty: DeclarationId(1036),
                     },
                     Field {
                         label: "root".to_string(),
-                        ty: DeclarationId(1033),
+                        ty: DeclarationId(1036),
                     },
                 ],
             },
@@ -57813,17 +57913,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24090, 24167),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1971),
+            id: DeclarationId(1975),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "base".to_string(),
-                        ty: DeclarationId(1034),
+                        ty: DeclarationId(1037),
                     },
                     Field {
                         label: "argument".to_string(),
-                        ty: DeclarationId(1033),
+                        ty: DeclarationId(1036),
                     },
                 ],
             },
@@ -57838,7 +57938,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24172, 24246),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1972),
+            id: DeclarationId(1976),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57848,7 +57948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "exponent".to_string(),
-                        ty: DeclarationId(947),
+                        ty: DeclarationId(950),
                     },
                 ],
             },
@@ -57863,7 +57963,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24866, 24922),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1973),
+            id: DeclarationId(1977),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57882,7 +57982,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24938, 24963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1974),
+            id: DeclarationId(1978),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57896,12 +57996,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26612, 26625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1975),
+            id: DeclarationId(1979),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "cost".to_string(),
-                    ty: DeclarationId(949),
+                    ty: DeclarationId(952),
                 }],
             },
             type_params: vec![],
@@ -57915,13 +58015,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26669, 26701),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1976),
+            id: DeclarationId(1980),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(949),
+                    value: DeclarationId(952),
                 }],
             },
             type_params: vec![],
@@ -57935,12 +58035,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26764, 26780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1977),
+            id: DeclarationId(1981),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "factors".to_string(),
-                    ty: DeclarationId(1976),
+                    ty: DeclarationId(1980),
                 }],
             },
             type_params: vec![],
@@ -57954,13 +58054,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26740, 26782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1978),
+            id: DeclarationId(1982),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(949),
+                    value: DeclarationId(952),
                 }],
             },
             type_params: vec![],
@@ -57974,13 +58074,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26844, 26860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1979),
+            id: DeclarationId(1983),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1978),
+                    value: DeclarationId(1982),
                 }],
             },
             type_params: vec![],
@@ -57994,12 +58094,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26839, 26861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1980),
+            id: DeclarationId(1984),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(1979),
+                    ty: DeclarationId(1983),
                 }],
             },
             type_params: vec![],
@@ -58013,13 +58113,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26811, 26863),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1981),
+            id: DeclarationId(1985),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(950),
+                    value: DeclarationId(953),
                 }],
             },
             type_params: vec![],
@@ -58033,12 +58133,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27161, 27176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1982),
+            id: DeclarationId(1986),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(1981),
+                    ty: DeclarationId(1985),
                 }],
             },
             type_params: vec![],
@@ -58052,7 +58152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27143, 27178),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1983),
+            id: DeclarationId(1987),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58066,7 +58166,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27261, 27273),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1984),
+            id: DeclarationId(1988),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58080,13 +58180,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27343, 27353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1985),
+            id: DeclarationId(1989),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1078),
+                    value: DeclarationId(1081),
                 }],
             },
             type_params: vec![],
@@ -58100,13 +58200,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1234, 1254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1986),
+            id: DeclarationId(1990),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1078),
+                    value: DeclarationId(1081),
                 }],
             },
             type_params: vec![],
@@ -58120,13 +58220,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1414, 1434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1987),
+            id: DeclarationId(1991),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(862),
+                template: DeclarationId(865),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(863),
-                    value: DeclarationId(989),
+                    parameter: DeclarationId(866),
+                    value: DeclarationId(992),
                 }],
             },
             type_params: vec![],
@@ -58140,11 +58240,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1988),
+            id: DeclarationId(1992),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744), DeclarationId(743)],
-                output: DeclarationId(1987),
+                output: DeclarationId(1991),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -58158,13 +58258,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1989),
+            id: DeclarationId(1993),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(20),
-                    value: DeclarationId(989),
+                    value: DeclarationId(992),
                 }],
             },
             type_params: vec![],
@@ -58178,11 +58278,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1990),
+            id: DeclarationId(1994),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(989), DeclarationId(989)],
-                output: DeclarationId(989),
+                inputs: vec![DeclarationId(992), DeclarationId(992)],
+                output: DeclarationId(992),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -58196,11 +58296,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1991),
+            id: DeclarationId(1995),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(989), DeclarationId(734)],
-                output: DeclarationId(989),
+                inputs: vec![DeclarationId(992), DeclarationId(734)],
+                output: DeclarationId(992),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -58214,11 +58314,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1992),
+            id: DeclarationId(1996),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(744), DeclarationId(989)],
-                output: DeclarationId(864),
+                inputs: vec![DeclarationId(744), DeclarationId(992)],
+                output: DeclarationId(867),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -58232,12 +58332,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1993),
+            id: DeclarationId(1997),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(993),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(991),
+                    parameter: DeclarationId(994),
                     value: DeclarationId(81),
                 }],
             },
@@ -58252,12 +58352,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4577, 4588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1994),
+            id: DeclarationId(1998),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(993),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(991),
+                    parameter: DeclarationId(994),
                     value: DeclarationId(81),
                 }],
             },
@@ -58272,7 +58372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4630, 4641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1995),
+            id: DeclarationId(1999),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58286,12 +58386,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4532, 4536),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1996),
+            id: DeclarationId(2000),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(991),
+                    ty: DeclarationId(994),
                 }],
             },
             type_params: vec![],
@@ -58305,13 +58405,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4541, 4551),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1997),
+            id: DeclarationId(2001),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1008),
+                    value: DeclarationId(1011),
                 }],
             },
             type_params: vec![],
@@ -58325,10 +58425,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1179, 1196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1998),
+            id: DeclarationId(2002),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(1007),
+                DeclarationId(1010),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -58342,13 +58442,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1999),
+            id: DeclarationId(2003),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1000),
+                    value: DeclarationId(1003),
                 }],
             },
             type_params: vec![],
@@ -58362,12 +58462,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1747, 1764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2000),
+            id: DeclarationId(2004),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1999),
+                    ty: DeclarationId(2003),
                 }],
             },
             type_params: vec![],
@@ -58381,13 +58481,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1736, 1765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2001),
+            id: DeclarationId(2005),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(997),
+                    value: DeclarationId(1000),
                 }],
             },
             type_params: vec![],
@@ -58401,12 +58501,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1777, 1795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2002),
+            id: DeclarationId(2006),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2001),
+                    ty: DeclarationId(2005),
                 }],
             },
             type_params: vec![],
@@ -58420,7 +58520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1770, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2003),
+            id: DeclarationId(2007),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58445,13 +58545,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2073, 2113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2004),
+            id: DeclarationId(2008),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1000),
+                    value: DeclarationId(1003),
                 }],
             },
             type_params: vec![],
@@ -58465,7 +58565,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2165, 2182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2005),
+            id: DeclarationId(2009),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58475,7 +58575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2004),
+                        ty: DeclarationId(2008),
                     },
                     Field {
                         label: "span".to_string(),
@@ -58494,13 +58594,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2118, 2211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2006),
+            id: DeclarationId(2010),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inner".to_string(),
-                        ty: DeclarationId(1000),
+                        ty: DeclarationId(1003),
                     },
                     Field {
                         label: "span".to_string(),
@@ -58519,13 +58619,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2216, 2280),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2007),
+            id: DeclarationId(2011),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1000),
+                    value: DeclarationId(1003),
                 }],
             },
             type_params: vec![],
@@ -58539,17 +58639,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2307, 2324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2008),
+            id: DeclarationId(2012),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2007),
+                        ty: DeclarationId(2011),
                     },
                     Field {
                         label: "output".to_string(),
-                        ty: DeclarationId(1000),
+                        ty: DeclarationId(1003),
                     },
                     Field {
                         label: "span".to_string(),
@@ -58568,7 +58668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2285, 2379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2009),
+            id: DeclarationId(2013),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58593,7 +58693,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3749, 3795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2010),
+            id: DeclarationId(2014),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58622,13 +58722,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3800, 3883),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2011),
+            id: DeclarationId(2015),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1004),
+                    value: DeclarationId(1007),
                 }],
             },
             type_params: vec![],
@@ -58642,7 +58742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3937, 3962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2012),
+            id: DeclarationId(2016),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58652,7 +58752,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2011),
+                        ty: DeclarationId(2015),
                     },
                     Field {
                         label: "span".to_string(),
@@ -58671,7 +58771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3888, 3991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2013),
+            id: DeclarationId(2017),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58690,7 +58790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4578, 4586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2014),
+            id: DeclarationId(2018),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58709,7 +58809,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4591, 4601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2015),
+            id: DeclarationId(2019),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58728,13 +58828,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4606, 4620),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2016),
+            id: DeclarationId(2020),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(1006),
+                        ty: DeclarationId(1009),
                     },
                     Field {
                         label: "span".to_string(),
@@ -58753,7 +58853,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4734, 4785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2017),
+            id: DeclarationId(2021),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58778,7 +58878,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4790, 4828),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2018),
+            id: DeclarationId(2022),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -58798,7 +58898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4856, 4868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2019),
+            id: DeclarationId(2023),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -58818,17 +58918,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4890, 4906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2020),
+            id: DeclarationId(2024),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "segments".to_string(),
-                        ty: DeclarationId(2018),
+                        ty: DeclarationId(2022),
                     },
                     Field {
                         label: "segment_spans".to_string(),
-                        ty: DeclarationId(2019),
+                        ty: DeclarationId(2023),
                     },
                     Field {
                         label: "span".to_string(),
@@ -58847,13 +58947,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4833, 4935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2021),
+            id: DeclarationId(2025),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1007),
+                    value: DeclarationId(1010),
                 }],
             },
             type_params: vec![],
@@ -58867,7 +58967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4980, 4997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2022),
+            id: DeclarationId(2026),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58877,7 +58977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2021),
+                        ty: DeclarationId(2025),
                     },
                     Field {
                         label: "span".to_string(),
@@ -58896,13 +58996,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4940, 5026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2023),
+            id: DeclarationId(2027),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1001),
+                    value: DeclarationId(1004),
                 }],
             },
             type_params: vec![],
@@ -58916,7 +59016,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5082, 5106),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2024),
+            id: DeclarationId(2028),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58926,7 +59026,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2023),
+                        ty: DeclarationId(2027),
                     },
                     Field {
                         label: "span".to_string(),
@@ -58945,13 +59045,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5031, 5135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2025),
+            id: DeclarationId(2029),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1007),
+                    value: DeclarationId(1010),
                 }],
             },
             type_params: vec![],
@@ -58965,7 +59065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5186, 5203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2026),
+            id: DeclarationId(2030),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58975,7 +59075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2025),
+                        ty: DeclarationId(2029),
                     },
                     Field {
                         label: "span".to_string(),
@@ -58994,7 +59094,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5140, 5232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2027),
+            id: DeclarationId(2031),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -59014,17 +59114,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5260, 5272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2028),
+            id: DeclarationId(2032),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2027),
+                        ty: DeclarationId(2031),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(1007),
+                        ty: DeclarationId(1010),
                     },
                     Field {
                         label: "span".to_string(),
@@ -59043,21 +59143,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5237, 5325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2029),
+            id: DeclarationId(2033),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "cond".to_string(),
-                        ty: DeclarationId(1007),
+                        ty: DeclarationId(1010),
                     },
                     Field {
                         label: "then_branch".to_string(),
-                        ty: DeclarationId(1007),
+                        ty: DeclarationId(1010),
                     },
                     Field {
                         label: "else_branch".to_string(),
-                        ty: DeclarationId(1007),
+                        ty: DeclarationId(1010),
                     },
                     Field {
                         label: "span".to_string(),
@@ -59076,13 +59176,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5330, 5449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2030),
+            id: DeclarationId(2034),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1003),
+                    value: DeclarationId(1006),
                 }],
             },
             type_params: vec![],
@@ -59096,17 +59196,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5503, 5524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2031),
+            id: DeclarationId(2035),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "scrutinee".to_string(),
-                        ty: DeclarationId(1007),
+                        ty: DeclarationId(1010),
                     },
                     Field {
                         label: "arms".to_string(),
-                        ty: DeclarationId(2030),
+                        ty: DeclarationId(2034),
                     },
                     Field {
                         label: "span".to_string(),
@@ -59125,13 +59225,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5454, 5553),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2032),
+            id: DeclarationId(2036),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1001),
+                    value: DeclarationId(1004),
                 }],
             },
             type_params: vec![],
@@ -59145,13 +59245,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5581, 5605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2033),
+            id: DeclarationId(2037),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2032),
+                        ty: DeclarationId(2036),
                     },
                     Field {
                         label: "span".to_string(),
@@ -59170,13 +59270,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5558, 5634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2034),
+            id: DeclarationId(2038),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1007),
+                    value: DeclarationId(1010),
                 }],
             },
             type_params: vec![],
@@ -59190,13 +59290,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5662, 5679),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2035),
+            id: DeclarationId(2039),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "elements".to_string(),
-                        ty: DeclarationId(2034),
+                        ty: DeclarationId(2038),
                     },
                     Field {
                         label: "span".to_string(),
@@ -59215,13 +59315,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5639, 5708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2036),
+            id: DeclarationId(2040),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1002),
+                    value: DeclarationId(1005),
                 }],
             },
             type_params: vec![],
@@ -59235,13 +59335,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 7802, 7823),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2037),
+            id: DeclarationId(2041),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "entries".to_string(),
-                        ty: DeclarationId(2036),
+                        ty: DeclarationId(2040),
                     },
                     Field {
                         label: "span".to_string(),
@@ -59260,10 +59360,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 7781, 7852),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2038),
+            id: DeclarationId(2042),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(1000),
+                DeclarationId(1003),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -59277,7 +59377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8783, 8795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2039),
+            id: DeclarationId(2043),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59287,11 +59387,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_ann".to_string(),
-                        ty: DeclarationId(2038),
+                        ty: DeclarationId(2042),
                     },
                     Field {
                         label: "expr".to_string(),
-                        ty: DeclarationId(1007),
+                        ty: DeclarationId(1010),
                     },
                 ],
             },
@@ -59306,7 +59406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8742, 8825),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2040),
+            id: DeclarationId(2044),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -59326,13 +59426,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8873, 8885),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2041),
+            id: DeclarationId(2045),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(996),
+                    value: DeclarationId(999),
                 }],
             },
             type_params: vec![],
@@ -59346,7 +59446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8900, 8918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2042),
+            id: DeclarationId(2046),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59356,19 +59456,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2040),
+                        ty: DeclarationId(2044),
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2041),
+                        ty: DeclarationId(2045),
                     },
                     Field {
                         label: "return_type".to_string(),
-                        ty: DeclarationId(1000),
+                        ty: DeclarationId(1003),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(1007),
+                        ty: DeclarationId(1010),
                     },
                     Field {
                         label: "span".to_string(),
@@ -59387,7 +59487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8830, 9002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2043),
+            id: DeclarationId(2047),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -59407,13 +59507,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9062, 9074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2044),
+            id: DeclarationId(2048),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(996),
+                    value: DeclarationId(999),
                 }],
             },
             type_params: vec![],
@@ -59427,7 +59527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9089, 9107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2045),
+            id: DeclarationId(2049),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59437,15 +59537,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2043),
+                        ty: DeclarationId(2047),
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2044),
+                        ty: DeclarationId(2048),
                     },
                     Field {
                         label: "return_type".to_string(),
-                        ty: DeclarationId(1000),
+                        ty: DeclarationId(1003),
                     },
                     Field {
                         label: "body_span".to_string(),
@@ -59468,10 +59568,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9007, 9195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2046),
+            id: DeclarationId(2050),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(1007),
+                DeclarationId(1010),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -59485,7 +59585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9260, 9272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2047),
+            id: DeclarationId(2051),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59495,11 +59595,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "ty".to_string(),
-                        ty: DeclarationId(1000),
+                        ty: DeclarationId(1003),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(2046),
+                        ty: DeclarationId(2050),
                     },
                     Field {
                         label: "body_span".to_string(),
@@ -59522,7 +59622,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9200, 9329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2048),
+            id: DeclarationId(2052),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -59542,13 +59642,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9349, 9361),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2049),
+            id: DeclarationId(2053),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2048),
+                        ty: DeclarationId(2052),
                     },
                     Field {
                         label: "span".to_string(),
@@ -59567,7 +59667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9334, 9381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2050),
+            id: DeclarationId(2054),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -59587,7 +59687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9407, 9419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2051),
+            id: DeclarationId(2055),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -59607,17 +59707,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9433, 9445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2052),
+            id: DeclarationId(2056),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2050),
+                        ty: DeclarationId(2054),
                     },
                     Field {
                         label: "names".to_string(),
-                        ty: DeclarationId(2051),
+                        ty: DeclarationId(2055),
                     },
                     Field {
                         label: "span".to_string(),
@@ -59636,7 +59736,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9386, 9474),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2053),
+            id: DeclarationId(2057),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -59656,7 +59756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9528, 9540),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2054),
+            id: DeclarationId(2058),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59666,7 +59766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2053),
+                        ty: DeclarationId(2057),
                     },
                     Field {
                         label: "span".to_string(),
@@ -59685,7 +59785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9479, 9569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2055),
+            id: DeclarationId(2059),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -59705,13 +59805,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9625, 9637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2056),
+            id: DeclarationId(2060),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(997),
+                    value: DeclarationId(1000),
                 }],
             },
             type_params: vec![],
@@ -59725,7 +59825,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9652, 9670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2057),
+            id: DeclarationId(2061),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59735,11 +59835,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2055),
+                        ty: DeclarationId(2059),
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2056),
+                        ty: DeclarationId(2060),
                     },
                     Field {
                         label: "span".to_string(),
@@ -59758,7 +59858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9574, 9699),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2058),
+            id: DeclarationId(2062),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -59778,13 +59878,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9752, 9764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2059),
+            id: DeclarationId(2063),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(998),
+                    value: DeclarationId(1001),
                 }],
             },
             type_params: vec![],
@@ -59798,10 +59898,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9781, 9801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2060),
+            id: DeclarationId(2064),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(1000),
+                DeclarationId(1003),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -59815,7 +59915,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9818, 9830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2061),
+            id: DeclarationId(2065),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59825,15 +59925,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2058),
+                        ty: DeclarationId(2062),
                     },
                     Field {
                         label: "variants".to_string(),
-                        ty: DeclarationId(2059),
+                        ty: DeclarationId(2063),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(2060),
+                        ty: DeclarationId(2064),
                     },
                     Field {
                         label: "span".to_string(),
@@ -59852,7 +59952,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9704, 9859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2062),
+            id: DeclarationId(2066),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -59872,10 +59972,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9914, 9926),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2063),
+            id: DeclarationId(2067),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(1007),
+                DeclarationId(1010),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -59889,7 +59989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9998, 10010),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2064),
+            id: DeclarationId(2068),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59899,7 +59999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2062),
+                        ty: DeclarationId(2066),
                     },
                     Field {
                         label: "nominal_opaque".to_string(),
@@ -59907,11 +60007,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1000),
+                        ty: DeclarationId(1003),
                     },
                     Field {
                         label: "refinement".to_string(),
-                        ty: DeclarationId(2063),
+                        ty: DeclarationId(2067),
                     },
                     Field {
                         label: "span".to_string(),
@@ -59930,13 +60030,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9864, 10039),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2065),
+            id: DeclarationId(2069),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(928),
+                    value: DeclarationId(931),
                 }],
             },
             type_params: vec![],
@@ -59954,7 +60054,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2066),
+            id: DeclarationId(2070),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59973,13 +60073,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2132, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2067),
+            id: DeclarationId(2071),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1012),
+                    value: DeclarationId(1015),
                 }],
             },
             type_params: vec![],
@@ -59993,12 +60093,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2174, 2190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2068),
+            id: DeclarationId(2072),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2067),
+                    ty: DeclarationId(2071),
                 }],
             },
             type_params: vec![],
@@ -60012,7 +60112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2162, 2191),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2069),
+            id: DeclarationId(2073),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60022,7 +60122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(1013),
+                        ty: DeclarationId(1016),
                     },
                 ],
             },
@@ -60037,7 +60137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2196, 2247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2070),
+            id: DeclarationId(2074),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60056,7 +60156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2252, 2267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2071),
+            id: DeclarationId(2075),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60075,7 +60175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2272, 2299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2072),
+            id: DeclarationId(2076),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -60086,7 +60186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(110),
-                        value: DeclarationId(1013),
+                        value: DeclarationId(1016),
                     },
                 ],
             },
@@ -60101,13 +60201,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 3931, 3949),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2073),
+            id: DeclarationId(2077),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1016),
+                    value: DeclarationId(1019),
                 }],
             },
             type_params: vec![],
@@ -60121,12 +60221,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 4580, 4595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2074),
+            id: DeclarationId(2078),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "input_order".to_string(),
-                    ty: DeclarationId(1019),
+                    ty: DeclarationId(1022),
                 }],
             },
             type_params: vec![],
@@ -60140,7 +60240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5022, 5076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2075),
+            id: DeclarationId(2079),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60154,13 +60254,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5341, 5350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2076),
+            id: DeclarationId(2080),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(928),
+                    value: DeclarationId(931),
                 }],
             },
             type_params: vec![],
@@ -60174,7 +60274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3589, 3617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2077),
+            id: DeclarationId(2081),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -60185,7 +60285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(110),
-                        value: DeclarationId(1021),
+                        value: DeclarationId(1024),
                     },
                 ],
             },
@@ -60200,10 +60300,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/services.dag", 6838, 6861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2078),
+            id: DeclarationId(2082),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(1025),
+                DeclarationId(1028),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -60217,10 +60317,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2329, 2345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2079),
+            id: DeclarationId(2083),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(1025),
+                DeclarationId(1028),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -60234,10 +60334,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2350, 2366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2080),
+            id: DeclarationId(2084),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(1025),
+                DeclarationId(1028),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -60251,7 +60351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2371, 2387),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2081),
+            id: DeclarationId(2085),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -60262,7 +60362,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(110),
-                        value: DeclarationId(1025),
+                        value: DeclarationId(1028),
                     },
                 ],
             },
@@ -60277,7 +60377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2632, 2660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2082),
+            id: DeclarationId(2086),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -60288,7 +60388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(110),
-                        value: DeclarationId(1025),
+                        value: DeclarationId(1028),
                     },
                 ],
             },
@@ -60303,10 +60403,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2704, 2732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2083),
+            id: DeclarationId(2087),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(1033),
+                DeclarationId(1036),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -60320,10 +60420,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5879, 5901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2084),
+            id: DeclarationId(2088),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(1034),
+                DeclarationId(1037),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -60337,7 +60437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6321, 6341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2085),
+            id: DeclarationId(2089),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60351,7 +60451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 667, 673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2086),
+            id: DeclarationId(2090),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60365,7 +60465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 678, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2087),
+            id: DeclarationId(2091),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60379,7 +60479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 696, 710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2088),
+            id: DeclarationId(2092),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60398,7 +60498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3232, 3258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2089),
+            id: DeclarationId(2093),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60417,7 +60517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3263, 3291),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2090),
+            id: DeclarationId(2094),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60436,7 +60536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3296, 3329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2091),
+            id: DeclarationId(2095),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60455,7 +60555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3334, 3365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2092),
+            id: DeclarationId(2096),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60474,7 +60574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3370, 3402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2093),
+            id: DeclarationId(2097),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60488,12 +60588,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4409, 4416),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2094),
+            id: DeclarationId(2098),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "previous".to_string(),
-                    ty: DeclarationId(1033),
+                    ty: DeclarationId(1036),
                 }],
             },
             type_params: vec![],
@@ -60507,7 +60607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4421, 4471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2095),
+            id: DeclarationId(2099),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60521,12 +60621,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4966, 4977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2096),
+            id: DeclarationId(2100),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inner".to_string(),
-                    ty: DeclarationId(1034),
+                    ty: DeclarationId(1037),
                 }],
             },
             type_params: vec![],
@@ -60540,7 +60640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4982, 5027),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2097),
+            id: DeclarationId(2101),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60559,12 +60659,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7131, 7165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2098),
+            id: DeclarationId(2102),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "amount".to_string(),
-                    ty: DeclarationId(1033),
+                    ty: DeclarationId(1036),
                 }],
             },
             type_params: vec![],
@@ -60578,12 +60678,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7170, 7214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2099),
+            id: DeclarationId(2103),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1033),
+                    ty: DeclarationId(1036),
                 }],
             },
             type_params: vec![],
@@ -60597,12 +60697,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7219, 7277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2100),
+            id: DeclarationId(2104),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "divisor".to_string(),
-                    ty: DeclarationId(1034),
+                    ty: DeclarationId(1037),
                 }],
             },
             type_params: vec![],
@@ -60616,7 +60716,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7282, 7338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2101),
+            id: DeclarationId(2105),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60635,7 +60735,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7343, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2102),
+            id: DeclarationId(2106),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60654,7 +60754,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7381, 7411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2103),
+            id: DeclarationId(2107),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60668,13 +60768,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7416, 7429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2104),
+            id: DeclarationId(2108),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1032),
+                    value: DeclarationId(1035),
                 }],
             },
             type_params: vec![],
@@ -60688,13 +60788,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7469, 7491),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2105),
+            id: DeclarationId(2109),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1025),
+                    value: DeclarationId(1028),
                 }],
             },
             type_params: vec![],
@@ -60708,7 +60808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7701, 7722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2106),
+            id: DeclarationId(2110),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60722,7 +60822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2107),
+            id: DeclarationId(2111),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60736,7 +60836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2108),
+            id: DeclarationId(2112),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60750,7 +60850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2109),
+            id: DeclarationId(2113),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60764,7 +60864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2110),
+            id: DeclarationId(2114),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60778,7 +60878,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2111),
+            id: DeclarationId(2115),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60792,7 +60892,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2112),
+            id: DeclarationId(2116),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60806,7 +60906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 716),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2113),
+            id: DeclarationId(2117),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60820,7 +60920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 721, 729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2114),
+            id: DeclarationId(2118),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60834,7 +60934,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 734, 742),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2115),
+            id: DeclarationId(2119),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60848,7 +60948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 747, 754),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2116),
+            id: DeclarationId(2120),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60862,7 +60962,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 759, 765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2117),
+            id: DeclarationId(2121),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60876,7 +60976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 770, 777),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2118),
+            id: DeclarationId(2122),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60890,7 +60990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 782, 788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2119),
+            id: DeclarationId(2123),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60904,7 +61004,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 793, 800),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2120),
+            id: DeclarationId(2124),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60923,7 +61023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 805, 818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2121),
+            id: DeclarationId(2125),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60942,7 +61042,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 823, 834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2122),
+            id: DeclarationId(2126),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60961,7 +61061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 839, 856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2123),
+            id: DeclarationId(2127),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60975,7 +61075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 861, 863),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2124),
+            id: DeclarationId(2128),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60989,7 +61089,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 868, 872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2125),
+            id: DeclarationId(2129),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61003,7 +61103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 877, 882),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2126),
+            id: DeclarationId(2130),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61017,7 +61117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 887, 889),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2127),
+            id: DeclarationId(2131),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61031,7 +61131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 894, 896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2128),
+            id: DeclarationId(2132),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61045,7 +61145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 901, 903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2129),
+            id: DeclarationId(2133),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61059,7 +61159,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 910),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2130),
+            id: DeclarationId(2134),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61073,7 +61173,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 915, 919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2131),
+            id: DeclarationId(2135),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61087,7 +61187,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 924, 929),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2132),
+            id: DeclarationId(2136),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61101,7 +61201,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 934, 938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2133),
+            id: DeclarationId(2137),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61115,7 +61215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 943, 948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2134),
+            id: DeclarationId(2138),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61129,7 +61229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 953, 959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2135),
+            id: DeclarationId(2139),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61143,7 +61243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 964, 972),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2136),
+            id: DeclarationId(2140),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61157,7 +61257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2137),
+            id: DeclarationId(2141),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61171,7 +61271,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 987, 992),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2138),
+            id: DeclarationId(2142),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61185,7 +61285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 997, 1005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2139),
+            id: DeclarationId(2143),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61199,7 +61299,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1010, 1019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2140),
+            id: DeclarationId(2144),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61213,7 +61313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1024, 1027),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2141),
+            id: DeclarationId(2145),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61227,7 +61327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1032, 1038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2142),
+            id: DeclarationId(2146),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61241,7 +61341,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1043, 1049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2143),
+            id: DeclarationId(2147),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61255,7 +61355,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1054, 1060),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2144),
+            id: DeclarationId(2148),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61269,7 +61369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1065, 1071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2145),
+            id: DeclarationId(2149),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61283,7 +61383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1076, 1084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2146),
+            id: DeclarationId(2150),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61297,7 +61397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1089, 1097),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2147),
+            id: DeclarationId(2151),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61311,7 +61411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1102, 1107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2148),
+            id: DeclarationId(2152),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61325,7 +61425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2149),
+            id: DeclarationId(2153),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61339,7 +61439,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1126, 1130),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2150),
+            id: DeclarationId(2154),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61353,7 +61453,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1135, 1143),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2151),
+            id: DeclarationId(2155),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61367,7 +61467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1148, 1151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2152),
+            id: DeclarationId(2156),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61381,7 +61481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1722, 1727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2153),
+            id: DeclarationId(2157),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61395,7 +61495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1732, 1736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2154),
+            id: DeclarationId(2158),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61409,7 +61509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1741, 1747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2155),
+            id: DeclarationId(2159),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61423,7 +61523,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1752, 1758),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2156),
+            id: DeclarationId(2160),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61437,7 +61537,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1763, 1767),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2157),
+            id: DeclarationId(2161),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61451,7 +61551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1772, 1778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2158),
+            id: DeclarationId(2162),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61465,7 +61565,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1783, 1792),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2159),
+            id: DeclarationId(2163),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61479,7 +61579,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1797, 1805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2160),
+            id: DeclarationId(2164),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61493,7 +61593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2161),
+            id: DeclarationId(2165),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61507,7 +61607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1823, 1830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2162),
+            id: DeclarationId(2166),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61521,7 +61621,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1835, 1841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2163),
+            id: DeclarationId(2167),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61535,7 +61635,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1846, 1853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2164),
+            id: DeclarationId(2168),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61549,7 +61649,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1858, 1864),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2165),
+            id: DeclarationId(2169),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61563,7 +61663,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1869, 1876),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2166),
+            id: DeclarationId(2170),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61577,7 +61677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2316, 2318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2167),
+            id: DeclarationId(2171),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61591,7 +61691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2323, 2327),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2168),
+            id: DeclarationId(2172),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61605,7 +61705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2332, 2337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2169),
+            id: DeclarationId(2173),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61619,7 +61719,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2342, 2344),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2170),
+            id: DeclarationId(2174),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61633,7 +61733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2349, 2351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2171),
+            id: DeclarationId(2175),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61647,7 +61747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2356, 2358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2172),
+            id: DeclarationId(2176),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61661,7 +61761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2363, 2365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2173),
+            id: DeclarationId(2177),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61675,7 +61775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2370, 2374),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2174),
+            id: DeclarationId(2178),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61689,7 +61789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2379, 2384),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2175),
+            id: DeclarationId(2179),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61703,7 +61803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2389, 2393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2176),
+            id: DeclarationId(2180),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61717,7 +61817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2398, 2403),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2177),
+            id: DeclarationId(2181),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61731,7 +61831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2408, 2414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2178),
+            id: DeclarationId(2182),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61745,7 +61845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2419, 2427),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2179),
+            id: DeclarationId(2183),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61759,7 +61859,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2432, 2437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2180),
+            id: DeclarationId(2184),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61773,7 +61873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2442, 2447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2181),
+            id: DeclarationId(2185),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61787,7 +61887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2452, 2460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2182),
+            id: DeclarationId(2186),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61801,7 +61901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2465, 2474),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2183),
+            id: DeclarationId(2187),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61815,7 +61915,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2479, 2482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2184),
+            id: DeclarationId(2188),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61829,7 +61929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2493),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2185),
+            id: DeclarationId(2189),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61843,7 +61943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2498, 2504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2186),
+            id: DeclarationId(2190),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61857,7 +61957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2509, 2515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2187),
+            id: DeclarationId(2191),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61871,7 +61971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2188),
+            id: DeclarationId(2192),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61885,7 +61985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2531, 2539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2189),
+            id: DeclarationId(2193),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61899,7 +61999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2544, 2552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2190),
+            id: DeclarationId(2194),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61913,7 +62013,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2557, 2562),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2191),
+            id: DeclarationId(2195),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61927,7 +62027,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2567, 2576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2192),
+            id: DeclarationId(2196),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61941,7 +62041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2581, 2585),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2193),
+            id: DeclarationId(2197),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61955,13 +62055,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2590, 2598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2194),
+            id: DeclarationId(2198),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1011),
+                    value: DeclarationId(1014),
                 }],
             },
             type_params: vec![],
@@ -61975,13 +62075,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 14633, 14656),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2195),
+            id: DeclarationId(2199),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1065),
+                    value: DeclarationId(1068),
                 }],
             },
             type_params: vec![],
@@ -61995,13 +62095,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 14858, 14873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2196),
+            id: DeclarationId(2200),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1067),
+                    value: DeclarationId(1070),
                 }],
             },
             type_params: vec![],
@@ -62015,7 +62115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 14878, 14898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2197),
+            id: DeclarationId(2201),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62029,7 +62129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2480, 2494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2198),
+            id: DeclarationId(2202),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62043,7 +62143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2499, 2509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2199),
+            id: DeclarationId(2203),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62057,7 +62157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2514, 2526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2200),
+            id: DeclarationId(2204),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62071,7 +62171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2531, 2543),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2201),
+            id: DeclarationId(2205),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62085,7 +62185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2548, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2202),
+            id: DeclarationId(2206),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62099,7 +62199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2566, 2578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2203),
+            id: DeclarationId(2207),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62113,7 +62213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2583, 2606),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2204),
+            id: DeclarationId(2208),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62127,7 +62227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3012, 3021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2205),
+            id: DeclarationId(2209),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62146,7 +62246,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3026, 3042),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2206),
+            id: DeclarationId(2210),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62160,7 +62260,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3701, 3709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2207),
+            id: DeclarationId(2211),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62174,7 +62274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3714, 3724),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2208),
+            id: DeclarationId(2212),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62188,7 +62288,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4539, 4552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2209),
+            id: DeclarationId(2213),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62202,7 +62302,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4557, 4570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2210),
+            id: DeclarationId(2214),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62216,7 +62316,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4575, 4583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2211),
+            id: DeclarationId(2215),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62230,12 +62330,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4608, 4616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2212),
+            id: DeclarationId(2216),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1059),
+                    ty: DeclarationId(1062),
                 }],
             },
             type_params: vec![],
@@ -62249,7 +62349,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4621, 4661),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2213),
+            id: DeclarationId(2217),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62268,7 +62368,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4666, 4699),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2214),
+            id: DeclarationId(2218),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62278,7 +62378,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "state".to_string(),
-                        ty: DeclarationId(1060),
+                        ty: DeclarationId(1063),
                     },
                 ],
             },
@@ -62293,7 +62393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4704, 4782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2215),
+            id: DeclarationId(2219),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62312,7 +62412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4948, 5011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2216),
+            id: DeclarationId(2220),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62341,21 +62441,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5016, 5107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2217),
+            id: DeclarationId(2221),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "input_sample".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "expected_output".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                 ],
             },
@@ -62370,17 +62470,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5112, 5244),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2218),
+            id: DeclarationId(2222),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "invariant".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                 ],
             },
@@ -62395,7 +62495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5459, 5548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2219),
+            id: DeclarationId(2223),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -62415,7 +62515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6348, 6360),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2220),
+            id: DeclarationId(2224),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62425,7 +62525,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2219),
+                        ty: DeclarationId(2223),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -62444,7 +62544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6297, 6394),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2221),
+            id: DeclarationId(2225),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -62464,7 +62564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 7094, 7106),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2222),
+            id: DeclarationId(2226),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62474,7 +62574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2221),
+                        ty: DeclarationId(2225),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -62493,21 +62593,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 7044, 7140),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2223),
+            id: DeclarationId(2227),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "lens_ref".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "expected_ref".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                 ],
             },
@@ -62522,21 +62622,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 7438, 7560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2224),
+            id: DeclarationId(2228),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject_ref".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "oracle_ref".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                 ],
             },
@@ -62551,17 +62651,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 7822, 7947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2225),
+            id: DeclarationId(2229),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "left_report_ref".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "right_report_ref".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                 ],
             },
@@ -62576,17 +62676,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 8514, 8626),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2226),
+            id: DeclarationId(2230),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "law".to_string(),
-                        ty: DeclarationId(1061),
+                        ty: DeclarationId(1064),
                     },
                     Field {
                         label: "lens_ref".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                 ],
             },
@@ -62601,17 +62701,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 9222, 9301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2227),
+            id: DeclarationId(2231),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "list_constant".to_string(),
-                        ty: DeclarationId(1050),
+                        ty: DeclarationId(1053),
                     },
                     Field {
                         label: "bound".to_string(),
@@ -62630,21 +62730,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 9521, 9634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2228),
+            id: DeclarationId(2232),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "list_constant".to_string(),
-                        ty: DeclarationId(1050),
+                        ty: DeclarationId(1053),
                     },
                     Field {
                         label: "subset_predicate".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                 ],
             },
@@ -62659,17 +62759,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 9639, 9775),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2229),
+            id: DeclarationId(2233),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "compile_target".to_string(),
-                        ty: DeclarationId(1048),
+                        ty: DeclarationId(1051),
                     },
                     Field {
                         label: "expected".to_string(),
-                        ty: DeclarationId(1049),
+                        ty: DeclarationId(1052),
                     },
                 ],
             },
@@ -62684,17 +62784,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 9780, 9862),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2230),
+            id: DeclarationId(2234),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "ratchet_kind".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                 ],
             },
@@ -62709,13 +62809,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 9867, 9953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2231),
+            id: DeclarationId(2235),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1048),
+                    value: DeclarationId(1051),
                 }],
             },
             type_params: vec![],
@@ -62729,17 +62829,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 10032, 10042),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2232),
+            id: DeclarationId(2236),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "generated_paths".to_string(),
-                        ty: DeclarationId(2231),
+                        ty: DeclarationId(2235),
                     },
                 ],
             },
@@ -62754,21 +62854,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 9958, 10048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2233),
+            id: DeclarationId(2237),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "target_lane".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "authority_doc".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                 ],
             },
@@ -62783,21 +62883,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 10990, 11124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2234),
+            id: DeclarationId(2238),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "target_lane".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                     Field {
                         label: "authority_doc".to_string(),
-                        ty: DeclarationId(1078),
+                        ty: DeclarationId(1081),
                     },
                 ],
             },
@@ -62812,12 +62912,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 11763, 11907),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2235),
+            id: DeclarationId(2239),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ledger".to_string(),
-                    ty: DeclarationId(812),
+                    ty: DeclarationId(815),
                 }],
             },
             type_params: vec![],
@@ -62831,13 +62931,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 12752, 12806),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2236),
+            id: DeclarationId(2240),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1011),
+                    value: DeclarationId(1014),
                 }],
             },
             type_params: vec![],
@@ -62851,13 +62951,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 13850, 13873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2237),
+            id: DeclarationId(2241),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1065),
+                    value: DeclarationId(1068),
                 }],
             },
             type_params: vec![],
@@ -62871,13 +62971,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 13919, 13934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2238),
+            id: DeclarationId(2242),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1011),
+                    value: DeclarationId(1014),
                 }],
             },
             type_params: vec![],
@@ -62891,7 +62991,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 14190, 14213),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2239),
+            id: DeclarationId(2243),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -62911,7 +63011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2240),
+            id: DeclarationId(2244),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62925,7 +63025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 532, 547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2241),
+            id: DeclarationId(2245),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62939,7 +63039,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 550, 561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2242),
+            id: DeclarationId(2246),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62953,7 +63053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2243),
+            id: DeclarationId(2247),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(722),
@@ -62970,7 +63070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2244),
+            id: DeclarationId(2248),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62984,7 +63084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5552, 5570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2245),
+            id: DeclarationId(2249),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62998,7 +63098,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5575, 5590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2246),
+            id: DeclarationId(2250),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63012,7 +63112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5619, 5640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2247),
+            id: DeclarationId(2251),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63026,7 +63126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5645, 5660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2248),
+            id: DeclarationId(2252),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63040,7 +63140,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7257, 7267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2249),
+            id: DeclarationId(2253),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63054,7 +63154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7272, 7283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2250),
+            id: DeclarationId(2254),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63068,7 +63168,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7288, 7301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2251),
+            id: DeclarationId(2255),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63082,7 +63182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7306, 7319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2252),
+            id: DeclarationId(2256),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63096,7 +63196,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7324, 7337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2253),
+            id: DeclarationId(2257),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63110,7 +63210,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7342, 7356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2254),
+            id: DeclarationId(2258),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63124,7 +63224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7361, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2255),
+            id: DeclarationId(2259),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63138,7 +63238,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8118, 8135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2256),
+            id: DeclarationId(2260),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63152,7 +63252,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8140, 8150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2257),
+            id: DeclarationId(2261),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63166,7 +63266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8155, 8159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2258),
+            id: DeclarationId(2262),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -63176,11 +63276,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1460),
+                        ty: DeclarationId(1463),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1462),
+                        ty: DeclarationId(1465),
                     },
                     Field {
                         label: "range_min_inclusive".to_string(),
@@ -63196,7 +63296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "overflow".to_string(),
-                        ty: DeclarationId(1463),
+                        ty: DeclarationId(1466),
                     },
                 ],
             },
@@ -63211,7 +63311,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8937, 9509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2259),
+            id: DeclarationId(2263),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -63221,11 +63321,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1461),
+                        ty: DeclarationId(1464),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1462),
+                        ty: DeclarationId(1465),
                     },
                     Field {
                         label: "is_copy".to_string(),
@@ -63244,13 +63344,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9514, 9696),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2260),
+            id: DeclarationId(2264),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1464),
+                    value: DeclarationId(1467),
                 }],
             },
             type_params: vec![],
@@ -63378,7 +63478,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(13),
             Port {
                 id: PortId(13),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1686))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1689))),
                 produced_by: Some(NodeId(9)),
             },
         );
@@ -63402,7 +63502,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(16),
             Port {
                 id: PortId(16),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1687))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1690))),
                 produced_by: None,
             },
         );
@@ -63410,7 +63510,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(17),
             Port {
                 id: PortId(17),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1688))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1691))),
                 produced_by: Some(NodeId(11)),
             },
         );
@@ -63698,7 +63798,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(53),
             Port {
                 id: PortId(53),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1689))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1692))),
                 produced_by: None,
             },
         );
@@ -64562,7 +64662,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(161),
             Port {
                 id: PortId(161),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1690))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1693))),
                 produced_by: None,
             },
         );
@@ -64586,7 +64686,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(164),
             Port {
                 id: PortId(164),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1687))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1690))),
                 produced_by: Some(NodeId(113)),
             },
         );
@@ -64602,7 +64702,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(166),
             Port {
                 id: PortId(166),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1691))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1694))),
                 produced_by: Some(NodeId(115)),
             },
         );
@@ -64610,7 +64710,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(167),
             Port {
                 id: PortId(167),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1692))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1695))),
                 produced_by: None,
             },
         );
@@ -64714,7 +64814,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(180),
             Port {
                 id: PortId(180),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1693))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1696))),
                 produced_by: Some(NodeId(128)),
             },
         );
@@ -64858,7 +64958,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(198),
             Port {
                 id: PortId(198),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1694))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1697))),
                 produced_by: None,
             },
         );
@@ -64970,7 +65070,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(212),
             Port {
                 id: PortId(212),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1695))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1698))),
                 produced_by: None,
             },
         );
@@ -65082,7 +65182,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(226),
             Port {
                 id: PortId(226),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1696))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1699))),
                 produced_by: None,
             },
         );
@@ -65698,7 +65798,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(303),
             Port {
                 id: PortId(303),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1697))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1700))),
                 produced_by: None,
             },
         );
@@ -65810,7 +65910,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(317),
             Port {
                 id: PortId(317),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1698))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1701))),
                 produced_by: Some(NodeId(227)),
             },
         );
@@ -65818,7 +65918,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(318),
             Port {
                 id: PortId(318),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1699))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1702))),
                 produced_by: None,
             },
         );
@@ -65874,7 +65974,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(325),
             Port {
                 id: PortId(325),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1700))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1703))),
                 produced_by: Some(NodeId(234)),
             },
         );
@@ -65882,7 +65982,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(326),
             Port {
                 id: PortId(326),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1701))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1704))),
                 produced_by: None,
             },
         );
@@ -65898,7 +65998,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(328),
             Port {
                 id: PortId(328),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1702))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1705))),
                 produced_by: Some(NodeId(237)),
             },
         );
@@ -65914,7 +66014,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(330),
             Port {
                 id: PortId(330),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2239))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2243))),
                 produced_by: Some(NodeId(239)),
             },
         );
diff --git a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
index becc8fad7f7..7331fc44837 100644
--- a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
+++ b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
@@ -8,7 +8,7 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag {
         ports: bootstrapped_fixture_without_parse_surface_dag_ports(),
         diagnostics: bootstrapped_fixture_without_parse_surface_dag_diagnostics(),
         next_node_id: 275,
-        next_declaration_id: 2178,
+        next_declaration_id: 2182,
         next_port_id: 371,
         primitives: PrimitiveCache::default(),
         substrate_markers: SubstrateMarkers::default(),
@@ -23,7 +23,7 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag {
         callable_strategy_variants: CallableStrategyVariants::default(),
         clusters: bootstrapped_fixture_without_parse_surface_dag_clusters(),
         optional_match_disjs: bootstrapped_fixture_without_parse_surface_dag_optional_match_disjs(),
-        declaration_append_begin_after_bootstrap: 2178,
+        declaration_append_begin_after_bootstrap: 2182,
     }
 }
 
@@ -118,21 +118,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(7),
-            target: TransformTarget::Callable(DeclarationId(1709)),
+            target: TransformTarget::Callable(DeclarationId(1712)),
             inputs: vec![PortId(9)],
             output: PortId(11),
             span: SourceSpan::new("src/v3/std/algebra.dag", 10402, 10414),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(8),
-            target: TransformTarget::Callable(DeclarationId(1711)),
+            target: TransformTarget::Callable(DeclarationId(1714)),
             inputs: vec![PortId(11)],
             output: PortId(12),
             span: SourceSpan::new("src/v3/std/algebra.dag", 10395, 10442),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(9),
-            target: TransformTarget::Callable(DeclarationId(1671)),
+            target: TransformTarget::Callable(DeclarationId(1674)),
             inputs: vec![PortId(9), PortId(10), PortId(12)],
             output: PortId(13),
             span: SourceSpan::new("src/v3/std/algebra.dag", 10056, 10446),
@@ -148,7 +148,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(11),
-            target: TransformTarget::Callable(DeclarationId(1673)),
+            target: TransformTarget::Callable(DeclarationId(1676)),
             inputs: vec![PortId(14), PortId(15), PortId(16)],
             output: PortId(17),
             span: SourceSpan::new("src/v3/std/algebra.dag", 10577, 10633),
@@ -164,7 +164,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(13),
-            target: TransformTarget::Callable(DeclarationId(1712)),
+            target: TransformTarget::Callable(DeclarationId(1715)),
             inputs: vec![PortId(18)],
             output: PortId(19),
             span: SourceSpan::new("src/v3/std/algebra.dag", 10702, 10717),
@@ -317,7 +317,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(27),
-            target: TransformTarget::Callable(DeclarationId(1706)),
+            target: TransformTarget::Callable(DeclarationId(1709)),
             inputs: vec![PortId(35)],
             output: PortId(36),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11232, 11256),
@@ -347,7 +347,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(31),
-            target: TransformTarget::Callable(DeclarationId(1704)),
+            target: TransformTarget::Callable(DeclarationId(1707)),
             inputs: vec![PortId(40)],
             output: PortId(41),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11525, 11560),
@@ -477,14 +477,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(43),
-            target: TransformTarget::Callable(DeclarationId(1700)),
+            target: TransformTarget::Callable(DeclarationId(1703)),
             inputs: vec![PortId(54)],
             output: PortId(55),
             span: SourceSpan::new("src/v3/std/algebra.dag", 13121, 13136),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(44),
-            target: TransformTarget::Callable(DeclarationId(1714)),
+            target: TransformTarget::Callable(DeclarationId(1717)),
             inputs: vec![PortId(53), PortId(55)],
             output: PortId(56),
             span: SourceSpan::new("src/v3/std/algebra.dag", 13109, 13152),
@@ -1194,7 +1194,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(91),
-            target: TransformTarget::Callable(DeclarationId(1716)),
+            target: TransformTarget::Callable(DeclarationId(1719)),
             inputs: vec![PortId(136), PortId(137)],
             output: PortId(138),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15818, 15928),
@@ -1222,7 +1222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(95),
-            target: TransformTarget::Callable(DeclarationId(1718)),
+            target: TransformTarget::Callable(DeclarationId(1721)),
             inputs: vec![PortId(141), PortId(142)],
             output: PortId(143),
             span: SourceSpan::new("src/v3/std/algebra.dag", 15983, 16093),
@@ -1525,7 +1525,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
             id: NodeId(113),
             target: TransformTarget::FieldProject {
                 field_label: "rest".to_string(),
-                field_child: Some(DeclarationId(1485)),
+                field_child: Some(DeclarationId(1488)),
             },
             inputs: vec![PortId(161)],
             output: PortId(164),
@@ -1533,14 +1533,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(114),
-            target: TransformTarget::Callable(DeclarationId(1719)),
+            target: TransformTarget::Callable(DeclarationId(1722)),
             inputs: vec![PortId(163), PortId(164)],
             output: PortId(165),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17366, 17396),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(115),
-            target: TransformTarget::Callable(DeclarationId(1720)),
+            target: TransformTarget::Callable(DeclarationId(1723)),
             inputs: vec![PortId(162), PortId(165)],
             output: PortId(166),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17348, 17397),
@@ -1556,7 +1556,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(117),
-            target: TransformTarget::Callable(DeclarationId(1721)),
+            target: TransformTarget::Callable(DeclarationId(1724)),
             inputs: vec![],
             output: PortId(168),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17667, 17674),
@@ -1624,7 +1624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(125),
-            target: TransformTarget::Callable(DeclarationId(1722)),
+            target: TransformTarget::Callable(DeclarationId(1725)),
             inputs: vec![PortId(174), PortId(176)],
             output: PortId(177),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17792, 17835),
@@ -1871,7 +1871,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(141),
-            target: TransformTarget::Callable(DeclarationId(1700)),
+            target: TransformTarget::Callable(DeclarationId(1703)),
             inputs: vec![PortId(199)],
             output: PortId(200),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18968, 18983),
@@ -1918,7 +1918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(146),
-            target: TransformTarget::Callable(DeclarationId(1723)),
+            target: TransformTarget::Callable(DeclarationId(1726)),
             inputs: vec![PortId(205), PortId(206)],
             output: PortId(207),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19105, 19137),
@@ -2015,7 +2015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(153),
-            target: TransformTarget::Callable(DeclarationId(1700)),
+            target: TransformTarget::Callable(DeclarationId(1703)),
             inputs: vec![PortId(213)],
             output: PortId(214),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19239, 19254),
@@ -2079,7 +2079,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(160),
-            target: TransformTarget::Callable(DeclarationId(1706)),
+            target: TransformTarget::Callable(DeclarationId(1709)),
             inputs: vec![PortId(222)],
             output: PortId(223),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19357, 19416),
@@ -2162,7 +2162,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(165),
-            target: TransformTarget::Callable(DeclarationId(1700)),
+            target: TransformTarget::Callable(DeclarationId(1703)),
             inputs: vec![PortId(227)],
             output: PortId(228),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19705, 19720),
@@ -2263,7 +2263,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(176),
-            target: TransformTarget::Callable(DeclarationId(1704)),
+            target: TransformTarget::Callable(DeclarationId(1707)),
             inputs: vec![PortId(241)],
             output: PortId(242),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19947, 20010),
@@ -2735,7 +2735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(205),
-            target: TransformTarget::Callable(DeclarationId(1704)),
+            target: TransformTarget::Callable(DeclarationId(1707)),
             inputs: vec![PortId(291)],
             output: PortId(292),
             span: SourceSpan::new("src/v3/std/algebra.dag", 21393, 21421),
@@ -2830,7 +2830,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(216),
-            target: TransformTarget::Callable(DeclarationId(1724)),
+            target: TransformTarget::Callable(DeclarationId(1727)),
             inputs: vec![],
             output: PortId(305),
             span: SourceSpan::new("src/v3/std/algebra.dag", 21776, 21783),
@@ -2898,7 +2898,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(224),
-            target: TransformTarget::Callable(DeclarationId(1725)),
+            target: TransformTarget::Callable(DeclarationId(1728)),
             inputs: vec![PortId(311), PortId(313)],
             output: PortId(314),
             span: SourceSpan::new("src/v3/std/algebra.dag", 21924, 21989),
@@ -2987,7 +2987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(230),
-            target: TransformTarget::Callable(DeclarationId(1727)),
+            target: TransformTarget::Callable(DeclarationId(1730)),
             inputs: vec![PortId(318), PortId(320)],
             output: PortId(321),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22107, 22165),
@@ -3008,7 +3008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(233),
-            target: TransformTarget::Callable(DeclarationId(1728)),
+            target: TransformTarget::Callable(DeclarationId(1731)),
             inputs: vec![PortId(319), PortId(323)],
             output: PortId(324),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22191, 22237),
@@ -3051,14 +3051,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(236),
-            target: TransformTarget::Callable(DeclarationId(1729)),
+            target: TransformTarget::Callable(DeclarationId(1732)),
             inputs: vec![],
             output: PortId(327),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22508, 22515),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(237),
-            target: TransformTarget::Callable(DeclarationId(1731)),
+            target: TransformTarget::Callable(DeclarationId(1734)),
             inputs: vec![PortId(326), PortId(327)],
             output: PortId(328),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22496, 22537),
@@ -3076,7 +3076,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
             id: NodeId(239),
             target: TransformTarget::FieldProject {
                 field_label: "nodes".to_string(),
-                field_child: Some(DeclarationId(1662)),
+                field_child: Some(DeclarationId(1665)),
             },
             inputs: vec![PortId(329)],
             output: PortId(330),
@@ -3644,7 +3644,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
 #[allow(clippy::vec_init_then_push)]
 fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declaration> {
     {
-        let mut declarations = Vec::with_capacity(2178);
+        let mut declarations = Vec::with_capacity(2182);
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -16092,11 +16092,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(1481),
+                        ty: DeclarationId(1484),
                     },
                     Field {
                         label: "Cons".to_string(),
-                        ty: DeclarationId(1483),
+                        ty: DeclarationId(1486),
                     },
                 ],
             },
@@ -16129,7 +16129,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1451),
+                output: DeclarationId(1454),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)),
             },
             type_params: vec![DeclarationId(607)],
@@ -16160,8 +16160,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(608),
             name: Some("cons".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(609), DeclarationId(1452)],
-                output: DeclarationId(1453),
+                inputs: vec![DeclarationId(609), DeclarationId(1455)],
+                output: DeclarationId(1456),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)),
             },
             type_params: vec![DeclarationId(609)],
@@ -16193,7 +16193,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("singleton".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(611)],
-                output: DeclarationId(1454),
+                output: DeclarationId(1457),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)),
             },
             type_params: vec![DeclarationId(611)],
@@ -16224,7 +16224,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(612),
             name: Some("fold".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1455), DeclarationId(614), DeclarationId(1456)],
+                inputs: vec![DeclarationId(1458), DeclarationId(614), DeclarationId(1459)],
                 output: DeclarationId(614),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)),
             },
@@ -16270,7 +16270,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(615),
             name: Some("fold_right".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1457), DeclarationId(617), DeclarationId(1458)],
+                inputs: vec![DeclarationId(1460), DeclarationId(617), DeclarationId(1461)],
                 output: DeclarationId(617),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)),
             },
@@ -16316,8 +16316,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(618),
             name: Some("concat".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1459), DeclarationId(1460)],
-                output: DeclarationId(1461),
+                inputs: vec![DeclarationId(1462), DeclarationId(1463)],
+                output: DeclarationId(1464),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)),
             },
             type_params: vec![DeclarationId(619)],
@@ -16348,8 +16348,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(620),
             name: Some("map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1462), DeclarationId(1463)],
-                output: DeclarationId(1464),
+                inputs: vec![DeclarationId(1465), DeclarationId(1466)],
+                output: DeclarationId(1467),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)),
             },
             type_params: vec![DeclarationId(621), DeclarationId(622)],
@@ -16394,8 +16394,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(623),
             name: Some("filter".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1465), DeclarationId(1466)],
-                output: DeclarationId(1467),
+                inputs: vec![DeclarationId(1468), DeclarationId(1469)],
+                output: DeclarationId(1470),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)),
             },
             type_params: vec![DeclarationId(624)],
@@ -16426,8 +16426,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(625),
             name: Some("flat_map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1468), DeclarationId(1470)],
-                output: DeclarationId(1471),
+                inputs: vec![DeclarationId(1471), DeclarationId(1473)],
+                output: DeclarationId(1474),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)),
             },
             type_params: vec![DeclarationId(626), DeclarationId(627)],
@@ -16472,7 +16472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(628),
             name: Some("length".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1472)],
+                inputs: vec![DeclarationId(1475)],
                 output: DeclarationId(81),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)),
             },
@@ -16504,7 +16504,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(630),
             name: Some("is_empty".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1473)],
+                inputs: vec![DeclarationId(1476)],
                 output: DeclarationId(99),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)),
             },
@@ -16575,8 +16575,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(634),
             name: Some("enumerate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1474)],
-                output: DeclarationId(1476),
+                inputs: vec![DeclarationId(1477)],
+                output: DeclarationId(1479),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)),
             },
             type_params: vec![DeclarationId(635)],
@@ -16607,8 +16607,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(636),
             name: Some("enumerate_helper".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1477), DeclarationId(81)],
-                output: DeclarationId(1479),
+                inputs: vec![DeclarationId(1480), DeclarationId(81)],
+                output: DeclarationId(1482),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)),
             },
             type_params: vec![DeclarationId(637)],
@@ -16639,7 +16639,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(638),
             name: Some("contains".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1480), DeclarationId(639)],
+                inputs: vec![DeclarationId(1483), DeclarationId(639)],
                 output: DeclarationId(99),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)),
             },
@@ -16734,7 +16734,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1484),
+                        ty: DeclarationId(1487),
                     },
                 ],
             },
@@ -16777,7 +16777,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1485),
+                        ty: DeclarationId(1488),
                     },
                 ],
             },
@@ -16812,11 +16812,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LiteralToken".to_string(),
-                        ty: DeclarationId(1500),
+                        ty: DeclarationId(1503),
                     },
                     Field {
                         label: "ParamToken".to_string(),
-                        ty: DeclarationId(1501),
+                        ty: DeclarationId(1504),
                     },
                 ],
             },
@@ -16836,7 +16836,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1502),
+                    ty: DeclarationId(1505),
                 }],
             },
             type_params: vec![],
@@ -16856,11 +16856,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ParsedSegmentTokens".to_string(),
-                        ty: DeclarationId(1504),
+                        ty: DeclarationId(1507),
                     },
                     Field {
                         label: "MalformedPathSegment".to_string(),
-                        ty: DeclarationId(1505),
+                        ty: DeclarationId(1508),
                     },
                 ],
             },
@@ -16881,11 +16881,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ParsedPathTemplate".to_string(),
-                        ty: DeclarationId(1506),
+                        ty: DeclarationId(1509),
                     },
                     Field {
                         label: "MalformedPathTemplate".to_string(),
-                        ty: DeclarationId(1507),
+                        ty: DeclarationId(1510),
                     },
                 ],
             },
@@ -16940,7 +16940,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("last_path_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(649)],
-                output: DeclarationId(1486),
+                output: DeclarationId(1489),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)),
             },
             type_params: vec![],
@@ -16960,15 +16960,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ReadEffect".to_string(),
-                        ty: DeclarationId(1508),
+                        ty: DeclarationId(1511),
                     },
                     Field {
                         label: "UpsertEffect".to_string(),
-                        ty: DeclarationId(1509),
+                        ty: DeclarationId(1512),
                     },
                     Field {
                         label: "DeleteEffect".to_string(),
-                        ty: DeclarationId(1510),
+                        ty: DeclarationId(1513),
                     },
                 ],
             },
@@ -16989,11 +16989,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CreateEffect".to_string(),
-                        ty: DeclarationId(1511),
+                        ty: DeclarationId(1514),
                     },
                     Field {
                         label: "AppendEffect".to_string(),
-                        ty: DeclarationId(1512),
+                        ty: DeclarationId(1515),
                     },
                 ],
             },
@@ -17014,11 +17014,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IsIdempotent".to_string(),
-                        ty: DeclarationId(1513),
+                        ty: DeclarationId(1516),
                     },
                     Field {
                         label: "IsBreaking".to_string(),
-                        ty: DeclarationId(1514),
+                        ty: DeclarationId(1517),
                     },
                 ],
             },
@@ -17039,11 +17039,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PostAlways".to_string(),
-                        ty: DeclarationId(1515),
+                        ty: DeclarationId(1518),
                     },
                     Field {
                         label: "KeylessFallback".to_string(),
-                        ty: DeclarationId(1516),
+                        ty: DeclarationId(1519),
                     },
                 ],
             },
@@ -17064,15 +17064,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PathParam".to_string(),
-                        ty: DeclarationId(1517),
+                        ty: DeclarationId(1520),
                     },
                     Field {
                         label: "InputField".to_string(),
-                        ty: DeclarationId(1518),
+                        ty: DeclarationId(1521),
                     },
                     Field {
                         label: "CompositeKey".to_string(),
-                        ty: DeclarationId(1520),
+                        ty: DeclarationId(1523),
                     },
                 ],
             },
@@ -17093,15 +17093,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LatticeEffect".to_string(),
-                        ty: DeclarationId(1521),
+                        ty: DeclarationId(1524),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1522),
+                        ty: DeclarationId(1525),
                     },
                     Field {
                         label: "NonIdempotent".to_string(),
-                        ty: DeclarationId(1523),
+                        ty: DeclarationId(1526),
                     },
                 ],
             },
@@ -17183,15 +17183,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DerivedEffect".to_string(),
-                        ty: DeclarationId(1524),
+                        ty: DeclarationId(1527),
                     },
                     Field {
                         label: "UnknownHttpMethodInput".to_string(),
-                        ty: DeclarationId(1525),
+                        ty: DeclarationId(1528),
                     },
                     Field {
                         label: "MalformedPathInput".to_string(),
-                        ty: DeclarationId(1526),
+                        ty: DeclarationId(1529),
                     },
                 ],
             },
@@ -17212,11 +17212,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IdempotentComposition".to_string(),
-                        ty: DeclarationId(1527),
+                        ty: DeclarationId(1530),
                     },
                     Field {
                         label: "BrokenBy".to_string(),
-                        ty: DeclarationId(1529),
+                        ty: DeclarationId(1532),
                     },
                 ],
             },
@@ -17253,7 +17253,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(1487),
+                output: DeclarationId(1490),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20944, 20966)),
             },
             type_params: vec![],
@@ -17270,8 +17270,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(668),
             name: Some("indexed_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1488)],
-                output: DeclarationId(1490),
+                inputs: vec![DeclarationId(1491)],
+                output: DeclarationId(1493),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21060, 21153)),
             },
             type_params: vec![],
@@ -17288,8 +17288,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(669),
             name: Some("first_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1491)],
-                output: DeclarationId(1493),
+                inputs: vec![DeclarationId(1494)],
+                output: DeclarationId(1496),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21240, 21423)),
             },
             type_params: vec![],
@@ -17306,7 +17306,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(670),
             name: Some("compose_effects".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1494)],
+                inputs: vec![DeclarationId(1497)],
                 output: DeclarationId(665),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)),
             },
@@ -17371,19 +17371,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LinearEffect".to_string(),
-                        ty: DeclarationId(1531),
+                        ty: DeclarationId(1534),
                     },
                     Field {
                         label: "BranchEffect".to_string(),
-                        ty: DeclarationId(1533),
+                        ty: DeclarationId(1536),
                     },
                     Field {
                         label: "LoopEffect".to_string(),
-                        ty: DeclarationId(1534),
+                        ty: DeclarationId(1537),
                     },
                     Field {
                         label: "ParallelEffect".to_string(),
-                        ty: DeclarationId(1536),
+                        ty: DeclarationId(1539),
                     },
                 ],
             },
@@ -17433,11 +17433,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WorkflowCompositionVerdict".to_string(),
-                        ty: DeclarationId(1537),
+                        ty: DeclarationId(1540),
                     },
                     Field {
                         label: "IdempotencyUnsupported".to_string(),
-                        ty: DeclarationId(1538),
+                        ty: DeclarationId(1541),
                     },
                 ],
             },
@@ -17476,23 +17476,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoWorkflowProjection".to_string(),
-                        ty: DeclarationId(1539),
+                        ty: DeclarationId(1542),
                     },
                     Field {
                         label: "NotParallelEffectRoot".to_string(),
-                        ty: DeclarationId(1540),
+                        ty: DeclarationId(1543),
                     },
                     Field {
                         label: "NonLinearParallelBranch".to_string(),
-                        ty: DeclarationId(1541),
+                        ty: DeclarationId(1544),
                     },
                     Field {
                         label: "PairwiseNonCommute".to_string(),
-                        ty: DeclarationId(1542),
+                        ty: DeclarationId(1545),
                     },
                     Field {
                         label: "LensSurfacePending".to_string(),
-                        ty: DeclarationId(1543),
+                        ty: DeclarationId(1546),
                     },
                 ],
             },
@@ -17542,11 +17542,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ParallelCompositionVerdict".to_string(),
-                        ty: DeclarationId(1544),
+                        ty: DeclarationId(1547),
                     },
                     Field {
                         label: "ParallelismUnsupported".to_string(),
-                        ty: DeclarationId(1545),
+                        ty: DeclarationId(1548),
                     },
                 ],
             },
@@ -17601,7 +17601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("parse_http_method".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(1495),
+                output: DeclarationId(1498),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29707, 30005)),
             },
             type_params: vec![],
@@ -17636,7 +17636,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(684),
             name: Some("upsert_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1496), DeclarationId(167)],
+                inputs: vec![DeclarationId(1499), DeclarationId(167)],
                 output: DeclarationId(657),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)),
             },
@@ -17654,7 +17654,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(685),
             name: Some("delete_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1497), DeclarationId(167)],
+                inputs: vec![DeclarationId(1500), DeclarationId(167)],
                 output: DeclarationId(657),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)),
             },
@@ -17711,15 +17711,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Agrees".to_string(),
-                        ty: DeclarationId(1546),
+                        ty: DeclarationId(1549),
                     },
                     Field {
                         label: "Disagrees".to_string(),
-                        ty: DeclarationId(1547),
+                        ty: DeclarationId(1550),
                     },
                     Field {
                         label: "DerivationUnknown".to_string(),
-                        ty: DeclarationId(1548),
+                        ty: DeclarationId(1551),
                     },
                 ],
             },
@@ -17740,11 +17740,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ModifierNotDeclared".to_string(),
-                        ty: DeclarationId(1549),
+                        ty: DeclarationId(1552),
                     },
                     Field {
                         label: "ModifierDeclared".to_string(),
-                        ty: DeclarationId(1550),
+                        ty: DeclarationId(1553),
                     },
                 ],
             },
@@ -17882,8 +17882,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(695),
             name: Some("generate_idempotency_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1498)],
-                output: DeclarationId(1499),
+                inputs: vec![DeclarationId(1501)],
+                output: DeclarationId(1502),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 37296, 37566)),
             },
             type_params: vec![],
@@ -17951,15 +17951,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Uninferred".to_string(),
-                        ty: DeclarationId(1558),
+                        ty: DeclarationId(1561),
                     },
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(1559),
+                        ty: DeclarationId(1562),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(1560),
+                        ty: DeclarationId(1563),
                     },
                 ],
             },
@@ -17988,7 +17988,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "produced_by".to_string(),
-                        ty: DeclarationId(1561),
+                        ty: DeclarationId(1564),
                     },
                 ],
             },
@@ -18009,15 +18009,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LitInt".to_string(),
-                        ty: DeclarationId(1562),
+                        ty: DeclarationId(1565),
                     },
                     Field {
                         label: "LitBool".to_string(),
-                        ty: DeclarationId(1563),
+                        ty: DeclarationId(1566),
                     },
                     Field {
                         label: "LitString".to_string(),
-                        ty: DeclarationId(1564),
+                        ty: DeclarationId(1567),
                     },
                 ],
             },
@@ -18038,23 +18038,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1565),
+                        ty: DeclarationId(1568),
                     },
                     Field {
                         label: "UnresolvedIdentifier".to_string(),
-                        ty: DeclarationId(1566),
+                        ty: DeclarationId(1569),
                     },
                     Field {
                         label: "ResolvedByStructure".to_string(),
-                        ty: DeclarationId(1567),
+                        ty: DeclarationId(1570),
                     },
                     Field {
                         label: "ResolvedByName".to_string(),
-                        ty: DeclarationId(1568),
+                        ty: DeclarationId(1571),
                     },
                     Field {
                         label: "TypeParam".to_string(),
-                        ty: DeclarationId(1569),
+                        ty: DeclarationId(1572),
                     },
                 ],
             },
@@ -18075,15 +18075,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "OneUnit".to_string(),
-                        ty: DeclarationId(1570),
+                        ty: DeclarationId(1573),
                     },
                     Field {
                         label: "AdditionalUnit".to_string(),
-                        ty: DeclarationId(1571),
+                        ty: DeclarationId(1574),
                     },
                     Field {
                         label: "UnitCount".to_string(),
-                        ty: DeclarationId(1572),
+                        ty: DeclarationId(1575),
                     },
                 ],
             },
@@ -18104,11 +18104,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ZeroWidth".to_string(),
-                        ty: DeclarationId(1573),
+                        ty: DeclarationId(1576),
                     },
                     Field {
                         label: "PositiveWidth".to_string(),
-                        ty: DeclarationId(1574),
+                        ty: DeclarationId(1577),
                     },
                 ],
             },
@@ -18129,11 +18129,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "BoundedInterval".to_string(),
-                        ty: DeclarationId(1575),
+                        ty: DeclarationId(1578),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1576),
+                        ty: DeclarationId(1579),
                     },
                 ],
             },
@@ -18188,11 +18188,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "StaticBound".to_string(),
-                        ty: DeclarationId(1578),
+                        ty: DeclarationId(1581),
                     },
                     Field {
                         label: "PlatformDependent".to_string(),
-                        ty: DeclarationId(1579),
+                        ty: DeclarationId(1582),
                     },
                 ],
             },
@@ -18213,15 +18213,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(1580),
+                        ty: DeclarationId(1583),
                     },
                     Field {
                         label: "AtMostOne".to_string(),
-                        ty: DeclarationId(1581),
+                        ty: DeclarationId(1584),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1582),
+                        ty: DeclarationId(1585),
                     },
                 ],
             },
@@ -18317,27 +18317,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1583),
+                        ty: DeclarationId(1586),
                     },
                     Field {
                         label: "Reference".to_string(),
-                        ty: DeclarationId(1584),
+                        ty: DeclarationId(1587),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(1586),
+                        ty: DeclarationId(1589),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(1588),
+                        ty: DeclarationId(1591),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(1590),
+                        ty: DeclarationId(1593),
                     },
                     Field {
                         label: "Variant".to_string(),
-                        ty: DeclarationId(1592),
+                        ty: DeclarationId(1595),
                     },
                 ],
             },
@@ -18358,15 +18358,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ValueBodyUnparsed".to_string(),
-                        ty: DeclarationId(1593),
+                        ty: DeclarationId(1596),
                     },
                     Field {
                         label: "ValueBodyStructural".to_string(),
-                        ty: DeclarationId(1595),
+                        ty: DeclarationId(1598),
                     },
                     Field {
                         label: "ValueBodyMap".to_string(),
-                        ty: DeclarationId(1597),
+                        ty: DeclarationId(1600),
                     },
                 ],
             },
@@ -18387,23 +18387,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UserDefined".to_string(),
-                        ty: DeclarationId(1598),
+                        ty: DeclarationId(1601),
                     },
                     Field {
                         label: "ExternalRealization".to_string(),
-                        ty: DeclarationId(1599),
+                        ty: DeclarationId(1602),
                     },
                     Field {
                         label: "Pending".to_string(),
-                        ty: DeclarationId(1600),
+                        ty: DeclarationId(1603),
                     },
                     Field {
                         label: "NoBody".to_string(),
-                        ty: DeclarationId(1601),
+                        ty: DeclarationId(1604),
                     },
                     Field {
                         label: "Unparsed".to_string(),
-                        ty: DeclarationId(1602),
+                        ty: DeclarationId(1605),
                     },
                 ],
             },
@@ -18424,27 +18424,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(1603),
+                        ty: DeclarationId(1606),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(1605),
+                        ty: DeclarationId(1608),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(1607),
+                        ty: DeclarationId(1610),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(1609),
+                        ty: DeclarationId(1612),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1610),
+                        ty: DeclarationId(1613),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(1612),
+                        ty: DeclarationId(1615),
                     },
                 ],
             },
@@ -18469,7 +18469,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(1613),
+                        ty: DeclarationId(1616),
                     },
                     Field {
                         label: "connective".to_string(),
@@ -18477,27 +18477,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(1614),
+                        ty: DeclarationId(1617),
                     },
                     Field {
                         label: "phantom_params".to_string(),
-                        ty: DeclarationId(1615),
+                        ty: DeclarationId(1618),
                     },
                     Field {
                         label: "meta_tag".to_string(),
-                        ty: DeclarationId(1616),
+                        ty: DeclarationId(1619),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(1617),
+                        ty: DeclarationId(1620),
                     },
                     Field {
                         label: "value_body".to_string(),
-                        ty: DeclarationId(1618),
+                        ty: DeclarationId(1621),
                     },
                     Field {
                         label: "nominal_opacity".to_string(),
-                        ty: DeclarationId(1619),
+                        ty: DeclarationId(1622),
                     },
                     Field {
                         label: "span".to_string(),
@@ -18546,7 +18546,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "permitted_accessors".to_string(),
-                    ty: DeclarationId(1620),
+                    ty: DeclarationId(1623),
                 }],
             },
             type_params: vec![],
@@ -18566,19 +18566,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Add".to_string(),
-                        ty: DeclarationId(1621),
+                        ty: DeclarationId(1624),
                     },
                     Field {
                         label: "Sub".to_string(),
-                        ty: DeclarationId(1622),
+                        ty: DeclarationId(1625),
                     },
                     Field {
                         label: "Mul".to_string(),
-                        ty: DeclarationId(1623),
+                        ty: DeclarationId(1626),
                     },
                     Field {
                         label: "Div".to_string(),
-                        ty: DeclarationId(1624),
+                        ty: DeclarationId(1627),
                     },
                 ],
             },
@@ -18599,27 +18599,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(1625),
+                        ty: DeclarationId(1628),
                     },
                     Field {
                         label: "Ne".to_string(),
-                        ty: DeclarationId(1626),
+                        ty: DeclarationId(1629),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(1627),
+                        ty: DeclarationId(1630),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(1628),
+                        ty: DeclarationId(1631),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(1629),
+                        ty: DeclarationId(1632),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(1630),
+                        ty: DeclarationId(1633),
                     },
                 ],
             },
@@ -18640,11 +18640,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "And".to_string(),
-                        ty: DeclarationId(1631),
+                        ty: DeclarationId(1634),
                     },
                     Field {
                         label: "Or".to_string(),
-                        ty: DeclarationId(1632),
+                        ty: DeclarationId(1635),
                     },
                 ],
             },
@@ -18665,15 +18665,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Arithmetic".to_string(),
-                        ty: DeclarationId(1633),
+                        ty: DeclarationId(1636),
                     },
                     Field {
                         label: "Comparison".to_string(),
-                        ty: DeclarationId(1634),
+                        ty: DeclarationId(1637),
                     },
                     Field {
                         label: "Logical".to_string(),
-                        ty: DeclarationId(1635),
+                        ty: DeclarationId(1638),
                     },
                 ],
             },
@@ -18694,15 +18694,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Callable".to_string(),
-                        ty: DeclarationId(1636),
+                        ty: DeclarationId(1639),
                     },
                     Field {
                         label: "FieldProject".to_string(),
-                        ty: DeclarationId(1638),
+                        ty: DeclarationId(1641),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(1639),
+                        ty: DeclarationId(1642),
                     },
                 ],
             },
@@ -18723,11 +18723,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UnresolvedVariant".to_string(),
-                        ty: DeclarationId(1640),
+                        ty: DeclarationId(1643),
                     },
                     Field {
                         label: "ResolvedVariant".to_string(),
-                        ty: DeclarationId(1641),
+                        ty: DeclarationId(1644),
                     },
                 ],
             },
@@ -18785,7 +18785,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "binding".to_string(),
-                        ty: DeclarationId(1642),
+                        ty: DeclarationId(1645),
                     },
                 ],
             },
@@ -18921,11 +18921,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "members".to_string(),
-                        ty: DeclarationId(1643),
+                        ty: DeclarationId(1646),
                     },
                     Field {
                         label: "intra_cluster_calls".to_string(),
-                        ty: DeclarationId(1644),
+                        ty: DeclarationId(1647),
                     },
                 ],
             },
@@ -18946,11 +18946,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1645),
+                        ty: DeclarationId(1648),
                     },
                     Field {
                         label: "Descent".to_string(),
-                        ty: DeclarationId(1646),
+                        ty: DeclarationId(1649),
                     },
                 ],
             },
@@ -19005,7 +19005,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1647),
+                        ty: DeclarationId(1650),
                     },
                 ],
             },
@@ -19034,7 +19034,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1648),
+                        ty: DeclarationId(1651),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -19062,7 +19062,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserMatch".to_string(),
-                    ty: DeclarationId(1649),
+                    ty: DeclarationId(1652),
                 }],
             },
             type_params: vec![],
@@ -19090,7 +19090,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(1650),
+                        ty: DeclarationId(1653),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -19102,7 +19102,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1651),
+                        ty: DeclarationId(1654),
                     },
                 ],
             },
@@ -19167,7 +19167,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserCallable".to_string(),
-                    ty: DeclarationId(1652),
+                    ty: DeclarationId(1655),
                 }],
             },
             type_params: vec![],
@@ -19199,7 +19199,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(1653),
+                        ty: DeclarationId(1656),
                     },
                     Field {
                         label: "span".to_string(),
@@ -19207,11 +19207,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1654),
+                        ty: DeclarationId(1657),
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1655),
+                        ty: DeclarationId(1658),
                     },
                 ],
             },
@@ -19232,23 +19232,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(1656),
+                        ty: DeclarationId(1659),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(1657),
+                        ty: DeclarationId(1660),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(1658),
+                        ty: DeclarationId(1661),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(1659),
+                        ty: DeclarationId(1662),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(1660),
+                        ty: DeclarationId(1663),
                     },
                 ],
             },
@@ -19269,19 +19269,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "declarations".to_string(),
-                        ty: DeclarationId(1661),
+                        ty: DeclarationId(1664),
                     },
                     Field {
                         label: "nodes".to_string(),
-                        ty: DeclarationId(1662),
+                        ty: DeclarationId(1665),
                     },
                     Field {
                         label: "ports".to_string(),
-                        ty: DeclarationId(1663),
+                        ty: DeclarationId(1666),
                     },
                     Field {
                         label: "clusters".to_string(),
-                        ty: DeclarationId(1664),
+                        ty: DeclarationId(1667),
                     },
                 ],
             },
@@ -19321,15 +19321,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "accessor".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "realization".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                 ],
             },
@@ -19348,7 +19348,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("port".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744), DeclarationId(641)],
-                output: DeclarationId(1551),
+                output: DeclarationId(1554),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     18579,
@@ -19370,7 +19370,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("node".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744), DeclarationId(640)],
-                output: DeclarationId(1552),
+                output: DeclarationId(1555),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     18637,
@@ -19392,7 +19392,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("resolve_producer".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744), DeclarationId(641)],
-                output: DeclarationId(1553),
+                output: DeclarationId(1556),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     18712,
@@ -19414,7 +19414,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("declaration_by_id".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744), DeclarationId(642)],
-                output: DeclarationId(1554),
+                output: DeclarationId(1557),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     19101,
@@ -19436,7 +19436,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("lane2_workflow_at".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744), DeclarationId(640)],
-                output: DeclarationId(1555),
+                output: DeclarationId(1558),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     19425,
@@ -19460,15 +19460,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SingleRoot".to_string(),
-                        ty: DeclarationId(1665),
+                        ty: DeclarationId(1668),
                     },
                     Field {
                         label: "NoRoot".to_string(),
-                        ty: DeclarationId(1666),
+                        ty: DeclarationId(1669),
                     },
                     Field {
                         label: "AmbiguousRoot".to_string(),
-                        ty: DeclarationId(1668),
+                        ty: DeclarationId(1671),
                     },
                 ],
             },
@@ -19509,7 +19509,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("miss_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1556),
+                output: DeclarationId(1559),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     23430,
@@ -19531,7 +19531,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("hit_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(642)],
-                output: DeclarationId(1557),
+                output: DeclarationId(1560),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     23515,
@@ -19554,7 +19554,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1063),
+                    ty: DeclarationId(1066),
                 }],
             },
             type_params: vec![],
@@ -19574,15 +19574,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ShrinkEffect".to_string(),
-                        ty: DeclarationId(1688),
+                        ty: DeclarationId(1691),
                     },
                     Field {
                         label: "ProjectionEffect".to_string(),
-                        ty: DeclarationId(1689),
+                        ty: DeclarationId(1692),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1690),
+                        ty: DeclarationId(1693),
                     },
                 ],
             },
@@ -19603,19 +19603,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ShapeConstant".to_string(),
-                        ty: DeclarationId(1691),
+                        ty: DeclarationId(1694),
                     },
                     Field {
                         label: "ShapeLinearScan".to_string(),
-                        ty: DeclarationId(1692),
+                        ty: DeclarationId(1695),
                     },
                     Field {
                         label: "ShapeIterateBody".to_string(),
-                        ty: DeclarationId(1693),
+                        ty: DeclarationId(1696),
                     },
                     Field {
                         label: "ShapeSortBody".to_string(),
-                        ty: DeclarationId(1694),
+                        ty: DeclarationId(1697),
                     },
                 ],
             },
@@ -19644,15 +19644,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "size_effect".to_string(),
-                        ty: DeclarationId(1695),
+                        ty: DeclarationId(1698),
                     },
                     Field {
                         label: "cost_shape".to_string(),
-                        ty: DeclarationId(1696),
+                        ty: DeclarationId(1699),
                     },
                     Field {
                         label: "callback_element_position".to_string(),
-                        ty: DeclarationId(1697),
+                        ty: DeclarationId(1700),
                     },
                 ],
             },
@@ -19692,11 +19692,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DegreeTwo".to_string(),
-                        ty: DeclarationId(1698),
+                        ty: DeclarationId(1701),
                     },
                     Field {
                         label: "DegreeSuccessor".to_string(),
-                        ty: DeclarationId(1699),
+                        ty: DeclarationId(1702),
                     },
                 ],
             },
@@ -19717,31 +19717,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ConstantCost".to_string(),
-                        ty: DeclarationId(1700),
+                        ty: DeclarationId(1703),
                     },
                     Field {
                         label: "LinearCost".to_string(),
-                        ty: DeclarationId(1701),
+                        ty: DeclarationId(1704),
                     },
                     Field {
                         label: "PolynomialCost".to_string(),
-                        ty: DeclarationId(1702),
+                        ty: DeclarationId(1705),
                     },
                     Field {
                         label: "ProductCost".to_string(),
-                        ty: DeclarationId(1704),
+                        ty: DeclarationId(1707),
                     },
                     Field {
                         label: "SumCost".to_string(),
-                        ty: DeclarationId(1706),
+                        ty: DeclarationId(1709),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(1707),
+                        ty: DeclarationId(1710),
                     },
                     Field {
                         label: "UnknownCost".to_string(),
-                        ty: DeclarationId(1708),
+                        ty: DeclarationId(1711),
                     },
                 ],
             },
@@ -19803,7 +19803,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("miss_symbolic_cost_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1669),
+                output: DeclarationId(1672),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 9870, 9880)),
             },
             type_params: vec![],
@@ -19821,7 +19821,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("hit_symbolic_cost_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(762)],
-                output: DeclarationId(1670),
+                output: DeclarationId(1673),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 9954, 9969)),
             },
             type_params: vec![],
@@ -19839,7 +19839,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("two_terms".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(762), DeclarationId(762)],
-                output: DeclarationId(1671),
+                output: DeclarationId(1674),
                 body: ArrowBody::UserDefined(NodeId(10)),
             },
             type_params: vec![],
@@ -19856,8 +19856,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(768),
             name: Some("many_terms".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(762), DeclarationId(762), DeclarationId(1672)],
-                output: DeclarationId(1673),
+                inputs: vec![DeclarationId(762), DeclarationId(762), DeclarationId(1675)],
+                output: DeclarationId(1676),
                 body: ArrowBody::UserDefined(NodeId(12)),
             },
             type_params: vec![],
@@ -19982,7 +19982,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(775),
             name: Some("max_path".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1674)],
+                inputs: vec![DeclarationId(1677)],
                 output: DeclarationId(762),
                 body: ArrowBody::UserDefined(NodeId(45)),
             },
@@ -20054,8 +20054,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(779),
             name: Some("nsl_to_list".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1675)],
-                output: DeclarationId(1676),
+                inputs: vec![DeclarationId(1678)],
+                output: DeclarationId(1679),
                 body: ArrowBody::UserDefined(NodeId(116)),
             },
             type_params: vec![],
@@ -20072,8 +20072,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(780),
             name: Some("drop_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1677)],
-                output: DeclarationId(1678),
+                inputs: vec![DeclarationId(1680)],
+                output: DeclarationId(1681),
                 body: ArrowBody::UserDefined(NodeId(129)),
             },
             type_params: vec![],
@@ -20108,7 +20108,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(782),
             name: Some("reduce_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1679)],
+                inputs: vec![DeclarationId(1682)],
                 output: DeclarationId(762),
                 body: ArrowBody::UserDefined(NodeId(151)),
             },
@@ -20126,7 +20126,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(783),
             name: Some("wrap_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1680)],
+                inputs: vec![DeclarationId(1683)],
                 output: DeclarationId(762),
                 body: ArrowBody::UserDefined(NodeId(163)),
             },
@@ -20144,7 +20144,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(784),
             name: Some("reduce_product".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1681)],
+                inputs: vec![DeclarationId(1684)],
                 output: DeclarationId(762),
                 body: ArrowBody::UserDefined(NodeId(180)),
             },
@@ -20293,8 +20293,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(792),
             name: Some("filter_not_dominated_by".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1682), DeclarationId(762)],
-                output: DeclarationId(1683),
+                inputs: vec![DeclarationId(1685), DeclarationId(762)],
+                output: DeclarationId(1686),
                 body: ArrowBody::UserDefined(NodeId(228)),
             },
             type_params: vec![],
@@ -20311,8 +20311,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(793),
             name: Some("drop_dominated_step".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1684), DeclarationId(762)],
-                output: DeclarationId(1685),
+                inputs: vec![DeclarationId(1687), DeclarationId(762)],
+                output: DeclarationId(1688),
                 body: ArrowBody::UserDefined(NodeId(235)),
             },
             type_params: vec![],
@@ -20329,8 +20329,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(794),
             name: Some("drop_dominated".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1686)],
-                output: DeclarationId(1687),
+                inputs: vec![DeclarationId(1689)],
+                output: DeclarationId(1690),
                 body: ArrowBody::UserDefined(NodeId(238)),
             },
             type_params: vec![],
@@ -20350,10 +20350,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 inputs: vec![
                     DeclarationId(118),
                     DeclarationId(197),
-                    DeclarationId(1732),
+                    DeclarationId(1735),
                     DeclarationId(81),
-                    DeclarationId(1733),
-                    DeclarationId(1734),
+                    DeclarationId(1736),
+                    DeclarationId(1737),
                 ],
                 output: DeclarationId(803),
                 body: ArrowBody::Unparsed(SourceSpan::new(
@@ -20379,12 +20379,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1009),
+                    value: DeclarationId(1012),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1735)),
+            meta_tag: Some(DeclarationId(1738)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![])),
@@ -20399,11 +20399,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UserMessage".to_string(),
-                        ty: DeclarationId(1737),
+                        ty: DeclarationId(1740),
                     },
                     Field {
                         label: "AssistantMessage".to_string(),
-                        ty: DeclarationId(1739),
+                        ty: DeclarationId(1742),
                     },
                 ],
             },
@@ -20424,11 +20424,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UserTextBlock".to_string(),
-                        ty: DeclarationId(1740),
+                        ty: DeclarationId(1743),
                     },
                     Field {
                         label: "UserToolResultBlock".to_string(),
-                        ty: DeclarationId(1742),
+                        ty: DeclarationId(1745),
                     },
                 ],
             },
@@ -20449,11 +20449,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "AssistantTextBlock".to_string(),
-                        ty: DeclarationId(1743),
+                        ty: DeclarationId(1746),
                     },
                     Field {
                         label: "AssistantToolUseBlock".to_string(),
-                        ty: DeclarationId(1744),
+                        ty: DeclarationId(1747),
                     },
                 ],
             },
@@ -20474,31 +20474,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EndTurn".to_string(),
-                        ty: DeclarationId(1745),
+                        ty: DeclarationId(1748),
                     },
                     Field {
                         label: "MaxTokens".to_string(),
-                        ty: DeclarationId(1746),
+                        ty: DeclarationId(1749),
                     },
                     Field {
                         label: "StopSequence".to_string(),
-                        ty: DeclarationId(1747),
+                        ty: DeclarationId(1750),
                     },
                     Field {
                         label: "ToolUse".to_string(),
-                        ty: DeclarationId(1748),
+                        ty: DeclarationId(1751),
                     },
                     Field {
                         label: "PauseTurn".to_string(),
-                        ty: DeclarationId(1749),
+                        ty: DeclarationId(1752),
                     },
                     Field {
                         label: "Refusal".to_string(),
-                        ty: DeclarationId(1750),
+                        ty: DeclarationId(1753),
                     },
                     Field {
                         label: "ModelContextWindowExceeded".to_string(),
-                        ty: DeclarationId(1751),
+                        ty: DeclarationId(1754),
                     },
                 ],
             },
@@ -20581,7 +20581,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(1752),
+                        ty: DeclarationId(1755),
                     },
                     Field {
                         label: "model".to_string(),
@@ -20593,7 +20593,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "stop_sequence".to_string(),
-                        ty: DeclarationId(1753),
+                        ty: DeclarationId(1756),
                     },
                     Field {
                         label: "usage".to_string(),
@@ -20618,23 +20618,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ToNearestEven".to_string(),
-                        ty: DeclarationId(1754),
+                        ty: DeclarationId(1757),
                     },
                     Field {
                         label: "ToZero".to_string(),
-                        ty: DeclarationId(1755),
+                        ty: DeclarationId(1758),
                     },
                     Field {
                         label: "ToPositiveInfinity".to_string(),
-                        ty: DeclarationId(1756),
+                        ty: DeclarationId(1759),
                     },
                     Field {
                         label: "ToNegativeInfinity".to_string(),
-                        ty: DeclarationId(1757),
+                        ty: DeclarationId(1760),
                     },
                     Field {
                         label: "ToAwayFromZero".to_string(),
-                        ty: DeclarationId(1758),
+                        ty: DeclarationId(1761),
                     },
                 ],
             },
@@ -20646,7 +20646,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 757, 868),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1185, 1296),
         });
         declarations.push(Declaration {
             id: DeclarationId(805),
@@ -20655,15 +20655,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1759),
+                        ty: DeclarationId(1762),
                     },
                     Field {
                         label: "BinaryPrecision".to_string(),
-                        ty: DeclarationId(1760),
+                        ty: DeclarationId(1763),
                     },
                     Field {
                         label: "DecimalPrecision".to_string(),
-                        ty: DeclarationId(1761),
+                        ty: DeclarationId(1764),
                     },
                 ],
             },
@@ -20675,7 +20675,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1131, 1316),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1559, 1744),
         });
         declarations.push(Declaration {
             id: DeclarationId(806),
@@ -20684,15 +20684,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoNaN".to_string(),
-                        ty: DeclarationId(1762),
+                        ty: DeclarationId(1765),
                     },
                     Field {
                         label: "QuietNaN".to_string(),
-                        ty: DeclarationId(1763),
+                        ty: DeclarationId(1766),
                     },
                     Field {
                         label: "QuietAndSignalingNaN".to_string(),
-                        ty: DeclarationId(1764),
+                        ty: DeclarationId(1767),
                     },
                 ],
             },
@@ -20704,7 +20704,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1501, 1557),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1929, 1985),
         });
         declarations.push(Declaration {
             id: DeclarationId(807),
@@ -20713,11 +20713,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoInfinity".to_string(),
-                        ty: DeclarationId(1765),
+                        ty: DeclarationId(1768),
                     },
                     Field {
                         label: "SignedInfinity".to_string(),
-                        ty: DeclarationId(1766),
+                        ty: DeclarationId(1769),
                     },
                 ],
             },
@@ -20729,7 +20729,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1747, 1796),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2175, 2224),
         });
         declarations.push(Declaration {
             id: DeclarationId(808),
@@ -20738,11 +20738,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoSignedZero".to_string(),
-                        ty: DeclarationId(1767),
+                        ty: DeclarationId(1770),
                     },
                     Field {
                         label: "SignedZero".to_string(),
-                        ty: DeclarationId(1768),
+                        ty: DeclarationId(1771),
                     },
                 ],
             },
@@ -20754,7 +20754,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1989, 2038),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2417, 2466),
         });
         declarations.push(Declaration {
             id: DeclarationId(809),
@@ -20763,15 +20763,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoSubnormals".to_string(),
-                        ty: DeclarationId(1769),
+                        ty: DeclarationId(1772),
                     },
                     Field {
                         label: "GradualUnderflow".to_string(),
-                        ty: DeclarationId(1770),
+                        ty: DeclarationId(1773),
                     },
                     Field {
                         label: "FlushToZero".to_string(),
-                        ty: DeclarationId(1771),
+                        ty: DeclarationId(1774),
                     },
                 ],
             },
@@ -20783,10 +20783,90 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2235, 2303),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2663, 2731),
         });
         declarations.push(Declaration {
             id: DeclarationId(810),
+            name: Some("SpecialValues".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "nan".to_string(),
+                        ty: DeclarationId(806),
+                    },
+                    Field {
+                        label: "infinity".to_string(),
+                        ty: DeclarationId(807),
+                    },
+                    Field {
+                        label: "signed_zero".to_string(),
+                        ty: DeclarationId(808),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3007, 3105),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(811),
+            name: Some("ApproximateField".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "base".to_string(),
+                        ty: DeclarationId(1775),
+                    },
+                    Field {
+                        label: "rounding".to_string(),
+                        ty: DeclarationId(804),
+                    },
+                    Field {
+                        label: "precision".to_string(),
+                        ty: DeclarationId(805),
+                    },
+                    Field {
+                        label: "special_values".to_string(),
+                        ty: DeclarationId(810),
+                    },
+                    Field {
+                        label: "subnormal_policy".to_string(),
+                        ty: DeclarationId(809),
+                    },
+                ],
+            },
+            type_params: vec![DeclarationId(812)],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3341, 3502),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(812),
+            name: None,
+            connective: TypeConnective::Atom(AtomPayload::TypeParam("F".to_string())),
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3341, 3502),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(813),
             name: Some("BinShim".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -20800,7 +20880,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "entry".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                 ],
             },
@@ -20815,17 +20895,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bin_shim.dag", 801, 894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(811),
+            id: DeclarationId(814),
             name: Some("BridgeStatus".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Retired".to_string(),
-                        ty: DeclarationId(1772),
+                        ty: DeclarationId(1776),
                     },
                     Field {
                         label: "Open".to_string(),
-                        ty: DeclarationId(1773),
+                        ty: DeclarationId(1777),
                     },
                 ],
             },
@@ -20840,12 +20920,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4292, 4330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(812),
+            id: DeclarationId(815),
             name: Some("BridgeLedgerRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1063),
+                    ty: DeclarationId(1066),
                 }],
             },
             type_params: vec![],
@@ -20859,7 +20939,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 5294, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(813),
+            id: DeclarationId(816),
             name: Some("BridgeLedgerRow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -20873,7 +20953,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "status".to_string(),
-                        ty: DeclarationId(811),
+                        ty: DeclarationId(814),
                     },
                     Field {
                         label: "authority".to_string(),
@@ -20891,47 +20971,47 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 5984, 6094),
         });
-        declarations.push(Declaration { id: DeclarationId(814), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(813) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1774)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_source_span_file_participation_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R3".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1773), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("ROADMAP.md#lens-fold-file-path-semantics".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_mark_bootstrap_secret_nominal_opacity_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1772), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #937".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_dispatch_pr1183_slice_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1772), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/canonical_lens_bridge_ratchet_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1773), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r2-pb-canonical-lens-bridge-disposition.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1773), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #1171".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1773), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/r3-structure.md:83".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6558, 8315) });
+        declarations.push(Declaration { id: DeclarationId(817), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(816) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1778)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_source_span_file_participation_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R3".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1777), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("ROADMAP.md#lens-fold-file-path-semantics".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_mark_bootstrap_secret_nominal_opacity_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1776), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #937".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_dispatch_pr1183_slice_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1776), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/canonical_lens_bridge_ratchet_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1777), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r2-pb-canonical-lens-bridge-disposition.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1777), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #1171".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1777), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/r3-structure.md:83".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6558, 8315) });
         declarations.push(Declaration {
-            id: DeclarationId(815),
+            id: DeclarationId(818),
             name: Some("CleanEmissionContract".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "expression_wrapping".to_string(),
-                        ty: DeclarationId(817),
+                        ty: DeclarationId(820),
                     },
                     Field {
                         label: "pattern_bindings".to_string(),
-                        ty: DeclarationId(818),
+                        ty: DeclarationId(821),
                     },
                     Field {
                         label: "variant_payload_field_access".to_string(),
-                        ty: DeclarationId(819),
+                        ty: DeclarationId(822),
                     },
                     Field {
                         label: "imports".to_string(),
-                        ty: DeclarationId(820),
+                        ty: DeclarationId(823),
                     },
                     Field {
                         label: "block_return".to_string(),
-                        ty: DeclarationId(821),
+                        ty: DeclarationId(824),
                     },
                     Field {
                         label: "variable_bindings".to_string(),
-                        ty: DeclarationId(822),
+                        ty: DeclarationId(825),
                     },
                     Field {
                         label: "match_arm_body".to_string(),
-                        ty: DeclarationId(823),
+                        ty: DeclarationId(826),
                     },
                     Field {
                         label: "correction_style".to_string(),
-                        ty: DeclarationId(824),
+                        ty: DeclarationId(827),
                     },
                     Field {
                         label: "post_emit_verifier".to_string(),
-                        ty: DeclarationId(825),
+                        ty: DeclarationId(828),
                     },
                 ],
             },
@@ -20946,17 +21026,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 562, 944),
         });
         declarations.push(Declaration {
-            id: DeclarationId(816),
+            id: DeclarationId(819),
             name: Some("TargetCleanEmissionBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(925),
+                        ty: DeclarationId(928),
                     },
                     Field {
                         label: "clean_emission".to_string(),
-                        ty: DeclarationId(815),
+                        ty: DeclarationId(818),
                     },
                 ],
             },
@@ -20971,21 +21051,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 1748, 1848),
         });
         declarations.push(Declaration {
-            id: DeclarationId(817),
+            id: DeclarationId(820),
             name: Some("ExpressionWrappingRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "WrapEverything".to_string(),
-                        ty: DeclarationId(1775),
+                        ty: DeclarationId(1779),
                     },
                     Field {
                         label: "WrapOnlyInOperandPosition".to_string(),
-                        ty: DeclarationId(1776),
+                        ty: DeclarationId(1780),
                     },
                     Field {
                         label: "NoWrapping".to_string(),
-                        ty: DeclarationId(1777),
+                        ty: DeclarationId(1781),
                     },
                 ],
             },
@@ -21000,25 +21080,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2192, 2283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(818),
+            id: DeclarationId(821),
             name: Some("PatternBindingRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "EmitBindingAlways".to_string(),
-                        ty: DeclarationId(1778),
+                        ty: DeclarationId(1782),
                     },
                     Field {
                         label: "EmitUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1779),
+                        ty: DeclarationId(1783),
                     },
                     Field {
                         label: "EmitPrefixedUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1780),
+                        ty: DeclarationId(1784),
                     },
                     Field {
                         label: "NotApplicablePatternBinding".to_string(),
-                        ty: DeclarationId(1781),
+                        ty: DeclarationId(1785),
                     },
                 ],
             },
@@ -21033,17 +21113,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2520, 2663),
         });
         declarations.push(Declaration {
-            id: DeclarationId(819),
+            id: DeclarationId(822),
             name: Some("VariantPayloadFieldAccessRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AccessFromPayloadBinding".to_string(),
-                        ty: DeclarationId(1782),
+                        ty: DeclarationId(1786),
                     },
                     Field {
                         label: "OverrideNamedFieldsAtBindingSite".to_string(),
-                        ty: DeclarationId(1783),
+                        ty: DeclarationId(1787),
                     },
                 ],
             },
@@ -21058,21 +21138,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3330, 3430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(820),
+            id: DeclarationId(823),
             name: Some("ImportRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ImportEverythingDeclared".to_string(),
-                        ty: DeclarationId(1784),
+                        ty: DeclarationId(1788),
                     },
                     Field {
                         label: "IncludeOnlyReferenced".to_string(),
-                        ty: DeclarationId(1785),
+                        ty: DeclarationId(1789),
                     },
                     Field {
                         label: "ImportPerUsageSite".to_string(),
-                        ty: DeclarationId(1786),
+                        ty: DeclarationId(1790),
                     },
                 ],
             },
@@ -21087,21 +21167,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3544, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(821),
+            id: DeclarationId(824),
             name: Some("BlockReturnRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "WrapReturnValue".to_string(),
-                        ty: DeclarationId(1787),
+                        ty: DeclarationId(1791),
                     },
                     Field {
                         label: "NoWrappingOnTerminalExpression".to_string(),
-                        ty: DeclarationId(1788),
+                        ty: DeclarationId(1792),
                     },
                     Field {
                         label: "ExplicitReturnKeyword".to_string(),
-                        ty: DeclarationId(1789),
+                        ty: DeclarationId(1793),
                     },
                 ],
             },
@@ -21116,21 +21196,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3756, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(822),
+            id: DeclarationId(825),
             name: Some("VariableBindingRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "EmitLetBindingAlways".to_string(),
-                        ty: DeclarationId(1790),
+                        ty: DeclarationId(1794),
                     },
                     Field {
                         label: "EmitLetUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1791),
+                        ty: DeclarationId(1795),
                     },
                     Field {
                         label: "OmitLetBinding".to_string(),
-                        ty: DeclarationId(1792),
+                        ty: DeclarationId(1796),
                     },
                 ],
             },
@@ -21145,21 +21225,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3995, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(823),
+            id: DeclarationId(826),
             name: Some("MatchArmBodyRule".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "WrapBody".to_string(),
-                        ty: DeclarationId(1793),
+                        ty: DeclarationId(1797),
                     },
                     Field {
                         label: "NoWrappingOnNonComplexBody".to_string(),
-                        ty: DeclarationId(1794),
+                        ty: DeclarationId(1798),
                     },
                     Field {
                         label: "NotApplicableMatchArmBody".to_string(),
-                        ty: DeclarationId(1795),
+                        ty: DeclarationId(1799),
                     },
                 ],
             },
@@ -21174,7 +21254,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4328, 4423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(824),
+            id: DeclarationId(827),
             name: Some("CorrectionStyle".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -21207,7 +21287,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4736, 4854),
         });
         declarations.push(Declaration {
-            id: DeclarationId(825),
+            id: DeclarationId(828),
             name: Some("PostEmitVerifier".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -21217,7 +21297,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(1796),
+                        ty: DeclarationId(1800),
                     },
                     Field {
                         label: "syntax_only".to_string(),
@@ -21229,7 +21309,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "output_policy".to_string(),
-                        ty: DeclarationId(826),
+                        ty: DeclarationId(829),
                     },
                 ],
             },
@@ -21244,25 +21324,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5270, 5418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(826),
+            id: DeclarationId(829),
             name: Some("VerifierOutputPolicy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IgnoreVerifierOutput".to_string(),
-                        ty: DeclarationId(1797),
+                        ty: DeclarationId(1801),
                     },
                     Field {
                         label: "RequireEmptyStdout".to_string(),
-                        ty: DeclarationId(1798),
+                        ty: DeclarationId(1802),
                     },
                     Field {
                         label: "RequireEmptyStderr".to_string(),
-                        ty: DeclarationId(1799),
+                        ty: DeclarationId(1803),
                     },
                     Field {
                         label: "RequireEmptyStdoutAndStderr".to_string(),
-                        ty: DeclarationId(1800),
+                        ty: DeclarationId(1804),
                     },
                 ],
             },
@@ -21277,41 +21357,41 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5663, 5791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(827),
+            id: DeclarationId(830),
             name: Some("SizeBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CollectionSize".to_string(),
-                        ty: DeclarationId(1805),
+                        ty: DeclarationId(1809),
                     },
                     Field {
                         label: "ParserStreamSize".to_string(),
-                        ty: DeclarationId(1806),
+                        ty: DeclarationId(1810),
                     },
                     Field {
                         label: "WorklistDrainSize".to_string(),
-                        ty: DeclarationId(1807),
+                        ty: DeclarationId(1811),
                     },
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(1808),
+                        ty: DeclarationId(1812),
                     },
                     Field {
                         label: "ArithmeticParam".to_string(),
-                        ty: DeclarationId(1809),
+                        ty: DeclarationId(1813),
                     },
                     Field {
                         label: "ExplicitCountZero".to_string(),
-                        ty: DeclarationId(1810),
+                        ty: DeclarationId(1814),
                     },
                     Field {
                         label: "ExplicitCountPositive".to_string(),
-                        ty: DeclarationId(1811),
+                        ty: DeclarationId(1815),
                     },
                     Field {
                         label: "Forever".to_string(),
-                        ty: DeclarationId(1812),
+                        ty: DeclarationId(1816),
                     },
                 ],
             },
@@ -21326,11 +21406,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1337, 1633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(828),
+            id: DeclarationId(831),
             name: Some("tree_size_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(827),
+                output: DeclarationId(830),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     1682,
@@ -21348,10 +21428,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1635, 1713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(829),
+            id: DeclarationId(832),
             name: Some("positive_descent_count".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1018)],
+                inputs: vec![DeclarationId(1021)],
                 output: DeclarationId(81),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
@@ -21370,41 +21450,41 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1715, 1893),
         });
         declarations.push(Declaration {
-            id: DeclarationId(830),
+            id: DeclarationId(833),
             name: Some("CallPattern".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ChildAccessorCall".to_string(),
-                        ty: DeclarationId(1813),
+                        ty: DeclarationId(1817),
                     },
                     Field {
                         label: "CollectionShrinkCall".to_string(),
-                        ty: DeclarationId(1814),
+                        ty: DeclarationId(1818),
                     },
                     Field {
                         label: "ArithmeticSubtractCall".to_string(),
-                        ty: DeclarationId(1815),
+                        ty: DeclarationId(1819),
                     },
                     Field {
                         label: "ArithmeticDivideCall".to_string(),
-                        ty: DeclarationId(1816),
+                        ty: DeclarationId(1820),
                     },
                     Field {
                         label: "ParserAdvanceCall".to_string(),
-                        ty: DeclarationId(1817),
+                        ty: DeclarationId(1821),
                     },
                     Field {
                         label: "WorklistDrainCall".to_string(),
-                        ty: DeclarationId(1818),
+                        ty: DeclarationId(1822),
                     },
                     Field {
                         label: "FoldBodyCall".to_string(),
-                        ty: DeclarationId(1819),
+                        ty: DeclarationId(1823),
                     },
                     Field {
                         label: "SameArgumentCall".to_string(),
-                        ty: DeclarationId(1820),
+                        ty: DeclarationId(1824),
                     },
                 ],
             },
@@ -21419,21 +21499,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2144, 2591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(831),
+            id: DeclarationId(834),
             name: Some("ShrinkFactor".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UnitShrink".to_string(),
-                        ty: DeclarationId(1821),
+                        ty: DeclarationId(1825),
                     },
                     Field {
                         label: "ConstantShrink".to_string(),
-                        ty: DeclarationId(1822),
+                        ty: DeclarationId(1826),
                     },
                     Field {
                         label: "ProportionalShrink".to_string(),
-                        ty: DeclarationId(1823),
+                        ty: DeclarationId(1827),
                     },
                 ],
             },
@@ -21448,21 +21528,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2781, 2921),
         });
         declarations.push(Declaration {
-            id: DeclarationId(832),
+            id: DeclarationId(835),
             name: Some("IterationPrimitive".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Fold".to_string(),
-                        ty: DeclarationId(1824),
+                        ty: DeclarationId(1828),
                     },
                     Field {
                         label: "Descend".to_string(),
-                        ty: DeclarationId(1825),
+                        ty: DeclarationId(1829),
                     },
                     Field {
                         label: "Repeat".to_string(),
-                        ty: DeclarationId(1826),
+                        ty: DeclarationId(1830),
                     },
                 ],
             },
@@ -21477,25 +21557,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3083, 3138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(833),
+            id: DeclarationId(836),
             name: Some("LoweringTarget".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "primitive".to_string(),
-                        ty: DeclarationId(832),
+                        ty: DeclarationId(835),
                     },
                     Field {
                         label: "bound".to_string(),
-                        ty: DeclarationId(827),
+                        ty: DeclarationId(830),
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(1010),
+                        ty: DeclarationId(1013),
                     },
                     Field {
                         label: "factor".to_string(),
-                        ty: DeclarationId(1827),
+                        ty: DeclarationId(1831),
                     },
                 ],
             },
@@ -21510,11 +21590,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3330, 3456),
         });
         declarations.push(Declaration {
-            id: DeclarationId(834),
+            id: DeclarationId(837),
             name: Some("lower_call_pattern".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(830)],
-                output: DeclarationId(833),
+                inputs: vec![DeclarationId(833)],
+                output: DeclarationId(836),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     3767,
@@ -21532,11 +21612,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3705, 5318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(835),
+            id: DeclarationId(838),
             name: Some("size_bound_param".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(827)],
-                output: DeclarationId(1801),
+                inputs: vec![DeclarationId(830)],
+                output: DeclarationId(1805),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     5369,
@@ -21554,10 +21634,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5320, 5794),
         });
         declarations.push(Declaration {
-            id: DeclarationId(836),
+            id: DeclarationId(839),
             name: Some("is_constant_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(827)],
+                inputs: vec![DeclarationId(830)],
                 output: DeclarationId(99),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
@@ -21576,7 +21656,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5796, 6014),
         });
         declarations.push(Declaration {
-            id: DeclarationId(837),
+            id: DeclarationId(840),
             name: Some("forever_iteration_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
@@ -21598,11 +21678,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 6095, 6154),
         });
         declarations.push(Declaration {
-            id: DeclarationId(838),
+            id: DeclarationId(841),
             name: Some("constant_bound_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(827)],
-                output: DeclarationId(1802),
+                inputs: vec![DeclarationId(830)],
+                output: DeclarationId(1806),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     6297,
@@ -21620,21 +21700,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 6247, 6569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(839),
+            id: DeclarationId(842),
             name: Some("IterationDimension".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TreeDescent".to_string(),
-                        ty: DeclarationId(1828),
+                        ty: DeclarationId(1832),
                     },
                     Field {
                         label: "CollectionFold".to_string(),
-                        ty: DeclarationId(1829),
+                        ty: DeclarationId(1833),
                     },
                     Field {
                         label: "ArithmeticRepeat".to_string(),
-                        ty: DeclarationId(1830),
+                        ty: DeclarationId(1834),
                     },
                 ],
             },
@@ -21649,11 +21729,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7054, 7237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(840),
+            id: DeclarationId(843),
             name: Some("algebra_profile_to_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(53)],
-                output: DeclarationId(1803),
+                output: DeclarationId(1807),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     7370,
@@ -21671,11 +21751,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7290, 7863),
         });
         declarations.push(Declaration {
-            id: DeclarationId(841),
+            id: DeclarationId(844),
             name: Some("type_iteration_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(1804),
+                output: DeclarationId(1808),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     7935,
@@ -21693,17 +21773,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7865, 8154),
         });
         declarations.push(Declaration {
-            id: DeclarationId(842),
+            id: DeclarationId(845),
             name: Some("Mutability".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Immutable".to_string(),
-                        ty: DeclarationId(1831),
+                        ty: DeclarationId(1835),
                     },
                     Field {
                         label: "Mutable".to_string(),
-                        ty: DeclarationId(1832),
+                        ty: DeclarationId(1836),
                     },
                 ],
             },
@@ -21718,17 +21798,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 340, 381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(843),
+            id: DeclarationId(846),
             name: Some("Purity".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Pure".to_string(),
-                        ty: DeclarationId(1833),
+                        ty: DeclarationId(1837),
                     },
                     Field {
                         label: "Effectful".to_string(),
-                        ty: DeclarationId(1834),
+                        ty: DeclarationId(1838),
                     },
                 ],
             },
@@ -21743,17 +21823,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 598, 632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(844),
+            id: DeclarationId(847),
             name: Some("Structure".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ExplicitDAG".to_string(),
-                        ty: DeclarationId(1835),
+                        ty: DeclarationId(1839),
                     },
                     Field {
                         label: "Arbitrary".to_string(),
-                        ty: DeclarationId(1836),
+                        ty: DeclarationId(1840),
                     },
                 ],
             },
@@ -21768,17 +21848,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 891, 935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(845),
+            id: DeclarationId(848),
             name: Some("Iteration".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Bounded".to_string(),
-                        ty: DeclarationId(1837),
+                        ty: DeclarationId(1841),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1838),
+                        ty: DeclarationId(1842),
                     },
                 ],
             },
@@ -21793,25 +21873,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1147, 1187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(846),
+            id: DeclarationId(849),
             name: Some("ComputationModel".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "mutability".to_string(),
-                        ty: DeclarationId(842),
+                        ty: DeclarationId(845),
                     },
                     Field {
                         label: "purity".to_string(),
-                        ty: DeclarationId(843),
+                        ty: DeclarationId(846),
                     },
                     Field {
                         label: "structure".to_string(),
-                        ty: DeclarationId(844),
+                        ty: DeclarationId(847),
                     },
                     Field {
                         label: "iteration".to_string(),
-                        ty: DeclarationId(845),
+                        ty: DeclarationId(848),
                     },
                 ],
             },
@@ -21826,15 +21906,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1387, 1500),
         });
         declarations.push(Declaration {
-            id: DeclarationId(847),
+            id: DeclarationId(850),
             name: Some("dag_model".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(846),
+                template: DeclarationId(849),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(846)),
+            meta_tag: Some(DeclarationId(849)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -21842,28 +21922,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "mutability".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1831),
+                            constructor: DeclarationId(1835),
                             payload: vec![],
                         },
                     ),
                     (
                         "purity".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1833),
+                            constructor: DeclarationId(1837),
                             payload: vec![],
                         },
                     ),
                     (
                         "structure".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1835),
+                            constructor: DeclarationId(1839),
                             payload: vec![],
                         },
                     ),
                     (
                         "iteration".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1837),
+                            constructor: DeclarationId(1841),
                             payload: vec![],
                         },
                     ),
@@ -21874,25 +21954,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1502, 1625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(848),
+            id: DeclarationId(851),
             name: Some("MemoryModel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ValueOnly".to_string(),
-                        ty: DeclarationId(1839),
+                        ty: DeclarationId(1843),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(1840),
+                        ty: DeclarationId(1844),
                     },
                     Field {
                         label: "RefCounted".to_string(),
-                        ty: DeclarationId(1841),
+                        ty: DeclarationId(1845),
                     },
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(1842),
+                        ty: DeclarationId(1846),
                     },
                 ],
             },
@@ -21907,17 +21987,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2014, 2099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(849),
+            id: DeclarationId(852),
             name: Some("ScopeModel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LexicalScoping".to_string(),
-                        ty: DeclarationId(1843),
+                        ty: DeclarationId(1847),
                     },
                     Field {
                         label: "DynamicScoping".to_string(),
-                        ty: DeclarationId(1844),
+                        ty: DeclarationId(1848),
                     },
                 ],
             },
@@ -21932,17 +22012,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2365, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(850),
+            id: DeclarationId(853),
             name: Some("TargetExecutionModel".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "memory".to_string(),
-                        ty: DeclarationId(848),
+                        ty: DeclarationId(851),
                     },
                     Field {
                         label: "scope".to_string(),
-                        ty: DeclarationId(849),
+                        ty: DeclarationId(852),
                     },
                 ],
             },
@@ -21957,12 +22037,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2561, 2632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(851),
+            id: DeclarationId(854),
             name: Some("SourceFiltering".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "excluded_prefixes".to_string(),
-                    ty: DeclarationId(1845),
+                    ty: DeclarationId(1849),
                 }],
             },
             type_params: vec![],
@@ -21976,17 +22056,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2774, 2832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(852),
+            id: DeclarationId(855),
             name: Some("ShapeATargetSourceFiltering".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "internal".to_string(),
-                        ty: DeclarationId(851),
+                        ty: DeclarationId(854),
                     },
                     Field {
                         label: "additional_excluded_prefixes".to_string(),
-                        ty: DeclarationId(1846),
+                        ty: DeclarationId(1850),
                     },
                 ],
             },
@@ -22001,15 +22081,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3115, 3224),
         });
         declarations.push(Declaration {
-            id: DeclarationId(853),
+            id: DeclarationId(856),
             name: Some("internal_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(851),
+                template: DeclarationId(854),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(851)),
+            meta_tag: Some(DeclarationId(854)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -22028,17 +22108,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3226, 3381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(854),
+            id: DeclarationId(857),
             name: Some("ExecutionModelRequirement".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(1847),
+                        ty: DeclarationId(1851),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(1848),
+                        ty: DeclarationId(1852),
                     },
                 ],
             },
@@ -22053,37 +22133,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3659, 3729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(855),
+            id: DeclarationId(858),
             name: Some("CompilerDiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(1849),
+                        ty: DeclarationId(1853),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(1850),
+                        ty: DeclarationId(1854),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(1851),
+                        ty: DeclarationId(1855),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(1852),
+                        ty: DeclarationId(1856),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(1853),
+                        ty: DeclarationId(1857),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(1854),
+                        ty: DeclarationId(1858),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(1855),
+                        ty: DeclarationId(1859),
                     },
                 ],
             },
@@ -22098,7 +22178,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 990, 1148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(856),
+            id: DeclarationId(859),
             name: Some("Correction".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -22127,7 +22207,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1354, 1607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(857),
+            id: DeclarationId(860),
             name: Some("DiagnosticKindDecl".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -22152,12 +22232,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 2387, 2450),
         });
         declarations.push(Declaration {
-            id: DeclarationId(858),
+            id: DeclarationId(861),
             name: Some("LensInstanceKindWitness".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "kind_decl".to_string(),
-                    ty: DeclarationId(1063),
+                    ty: DeclarationId(1066),
                 }],
             },
             type_params: vec![],
@@ -22171,17 +22251,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 4652, 4712),
         });
         declarations.push(Declaration {
-            id: DeclarationId(859),
+            id: DeclarationId(862),
             name: Some("AnyDiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CompilerKind".to_string(),
-                        ty: DeclarationId(1856),
+                        ty: DeclarationId(1860),
                     },
                     Field {
                         label: "LensInstanceKind".to_string(),
-                        ty: DeclarationId(1857),
+                        ty: DeclarationId(1861),
                     },
                 ],
             },
@@ -22196,13 +22276,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5321, 5430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(860),
+            id: DeclarationId(863),
             name: Some("Diagnostic".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(859),
+                        ty: DeclarationId(862),
                     },
                     Field {
                         label: "span".to_string(),
@@ -22214,7 +22294,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "fixes".to_string(),
-                        ty: DeclarationId(1858),
+                        ty: DeclarationId(1862),
                     },
                 ],
             },
@@ -22229,37 +22309,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5799, 5907),
         });
         declarations.push(Declaration {
-            id: DeclarationId(861),
+            id: DeclarationId(864),
             name: Some("EmissionDiagnostic".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UnderRefined".to_string(),
-                        ty: DeclarationId(1859),
+                        ty: DeclarationId(1863),
                     },
                     Field {
                         label: "NoInhabitant".to_string(),
-                        ty: DeclarationId(1860),
+                        ty: DeclarationId(1864),
                     },
                     Field {
                         label: "ContradictoryUse".to_string(),
-                        ty: DeclarationId(1862),
+                        ty: DeclarationId(1866),
                     },
                     Field {
                         label: "OutOfR2Scope".to_string(),
-                        ty: DeclarationId(1863),
+                        ty: DeclarationId(1867),
                     },
                     Field {
                         label: "LifetimeProgramExtractionPending".to_string(),
-                        ty: DeclarationId(1864),
+                        ty: DeclarationId(1868),
                     },
                     Field {
                         label: "FoldNotImplemented".to_string(),
-                        ty: DeclarationId(1865),
+                        ty: DeclarationId(1869),
                     },
                     Field {
                         label: "MissingEmissionPath".to_string(),
-                        ty: DeclarationId(1866),
+                        ty: DeclarationId(1870),
                     },
                 ],
             },
@@ -22274,21 +22354,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 8541, 11258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(862),
+            id: DeclarationId(865),
             name: Some("Witness".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Inhabits".to_string(),
-                        ty: DeclarationId(1881),
+                        ty: DeclarationId(1885),
                     },
                     Field {
                         label: "Violates".to_string(),
-                        ty: DeclarationId(1882),
+                        ty: DeclarationId(1886),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(863)],
+            type_params: vec![DeclarationId(866)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -22299,7 +22379,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1600, 1689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(863),
+            id: DeclarationId(866),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -22313,17 +22393,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1600, 1689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(864),
+            id: DeclarationId(867),
             name: Some("OptionalDiagnostic".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "NoDiagnostic".to_string(),
-                        ty: DeclarationId(1883),
+                        ty: DeclarationId(1887),
                     },
                     Field {
                         label: "SomeDiagnostic".to_string(),
-                        ty: DeclarationId(1884),
+                        ty: DeclarationId(1888),
                     },
                 ],
             },
@@ -22338,21 +22418,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1843, 1924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(865),
+            id: DeclarationId(868),
             name: Some("DimensionReport".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DimensionOk".to_string(),
-                        ty: DeclarationId(1887),
+                        ty: DeclarationId(1891),
                     },
                     Field {
                         label: "DimensionFail".to_string(),
-                        ty: DeclarationId(1891),
+                        ty: DeclarationId(1895),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(866)],
+            type_params: vec![DeclarationId(869)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -22363,7 +22443,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2283, 2559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(866),
+            id: DeclarationId(869),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -22377,7 +22457,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2283, 2559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(867),
+            id: DeclarationId(870),
             name: Some("AnalysisDimension".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -22387,23 +22467,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "witness_of".to_string(),
-                        ty: DeclarationId(1893),
+                        ty: DeclarationId(1897),
                     },
                     Field {
                         label: "compose".to_string(),
-                        ty: DeclarationId(1894),
+                        ty: DeclarationId(1898),
                     },
                     Field {
                         label: "identity".to_string(),
-                        ty: DeclarationId(868),
+                        ty: DeclarationId(871),
                     },
                     Field {
                         label: "break_diagnostic".to_string(),
-                        ty: DeclarationId(1895),
+                        ty: DeclarationId(1899),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(868)],
+            type_params: vec![DeclarationId(871)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -22414,7 +22494,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3132, 3361),
         });
         declarations.push(Declaration {
-            id: DeclarationId(868),
+            id: DeclarationId(871),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -22428,18 +22508,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3132, 3361),
         });
         declarations.push(Declaration {
-            id: DeclarationId(869),
+            id: DeclarationId(872),
             name: Some("Dimension".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "value".to_string(),
-                    ty: DeclarationId(871),
+                    ty: DeclarationId(874),
                 }],
             },
-            type_params: vec![DeclarationId(870), DeclarationId(871)],
+            type_params: vec![DeclarationId(873), DeclarationId(874)],
             phantom_params: vec![PhantomParameter {
-                parameter: DeclarationId(870),
-                algebra: DeclarationId(1896),
+                parameter: DeclarationId(873),
+                algebra: DeclarationId(1900),
             }],
             meta_tag: None,
             specialization_parent: None,
@@ -22450,7 +22530,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4002, 4052),
         });
         declarations.push(Declaration {
-            id: DeclarationId(870),
+            id: DeclarationId(873),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -22464,7 +22544,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4002, 4052),
         });
         declarations.push(Declaration {
-            id: DeclarationId(871),
+            id: DeclarationId(874),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -22478,7 +22558,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4002, 4052),
         });
         declarations.push(Declaration {
-            id: DeclarationId(872),
+            id: DeclarationId(875),
             name: Some("Meters".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -22492,7 +22572,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4054, 4065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(873),
+            id: DeclarationId(876),
             name: Some("Seconds".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -22506,7 +22586,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4066, 4078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(874),
+            id: DeclarationId(877),
             name: Some("Kilograms".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -22520,7 +22600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4079, 4093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(875),
+            id: DeclarationId(878),
             name: Some("Amperes".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -22534,7 +22614,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4094, 4106),
         });
         declarations.push(Declaration {
-            id: DeclarationId(876),
+            id: DeclarationId(879),
             name: Some("Kelvin".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -22548,7 +22628,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4107, 4118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(877),
+            id: DeclarationId(880),
             name: Some("Moles".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -22562,7 +22642,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4119, 4129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(878),
+            id: DeclarationId(881),
             name: Some("Candela".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -22576,18 +22656,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4130, 4142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(879),
+            id: DeclarationId(882),
             name: Some("add_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1867),
-                    DeclarationId(1868),
-                    DeclarationId(1869),
+                    DeclarationId(1871),
+                    DeclarationId(1872),
+                    DeclarationId(1873),
                 ],
-                output: DeclarationId(1870),
+                output: DeclarationId(1874),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4316, 4338)),
             },
-            type_params: vec![DeclarationId(880), DeclarationId(881)],
+            type_params: vec![DeclarationId(883), DeclarationId(884)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -22598,7 +22678,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4144, 4338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(880),
+            id: DeclarationId(883),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -22612,7 +22692,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4144, 4338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(881),
+            id: DeclarationId(884),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -22626,18 +22706,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4144, 4338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(882),
+            id: DeclarationId(885),
             name: Some("sub_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1871),
-                    DeclarationId(1872),
-                    DeclarationId(1873),
+                    DeclarationId(1875),
+                    DeclarationId(1876),
+                    DeclarationId(1877),
                 ],
-                output: DeclarationId(1874),
+                output: DeclarationId(1878),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4512, 4534)),
             },
-            type_params: vec![DeclarationId(883), DeclarationId(884)],
+            type_params: vec![DeclarationId(886), DeclarationId(887)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -22648,7 +22728,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4340, 4534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(883),
+            id: DeclarationId(886),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -22662,7 +22742,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4340, 4534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(884),
+            id: DeclarationId(887),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -22676,14 +22756,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4340, 4534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(885),
+            id: DeclarationId(888),
             name: Some("mul_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1875), DeclarationId(1876), DeclarationId(887)],
-                output: DeclarationId(1877),
+                inputs: vec![DeclarationId(1879), DeclarationId(1880), DeclarationId(890)],
+                output: DeclarationId(1881),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4700, 4729)),
             },
-            type_params: vec![DeclarationId(886), DeclarationId(887)],
+            type_params: vec![DeclarationId(889), DeclarationId(890)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -22694,7 +22774,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4536, 4729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(886),
+            id: DeclarationId(889),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -22708,7 +22788,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4536, 4729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(887),
+            id: DeclarationId(890),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -22722,14 +22802,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4536, 4729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(888),
+            id: DeclarationId(891),
             name: Some("div_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1878), DeclarationId(1879), DeclarationId(890)],
-                output: DeclarationId(1880),
+                inputs: vec![DeclarationId(1882), DeclarationId(1883), DeclarationId(893)],
+                output: DeclarationId(1884),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4895, 4924)),
             },
-            type_params: vec![DeclarationId(889), DeclarationId(890)],
+            type_params: vec![DeclarationId(892), DeclarationId(893)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -22740,7 +22820,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4731, 4924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(889),
+            id: DeclarationId(892),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -22754,7 +22834,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4731, 4924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(890),
+            id: DeclarationId(893),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -22768,17 +22848,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4731, 4924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(891),
+            id: DeclarationId(894),
             name: Some("TypeRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -22790,7 +22870,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(1897),
+                        ty: DeclarationId(1901),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -22809,29 +22889,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 736, 887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(892),
+            id: DeclarationId(895),
             name: Some("TargetIntegerTypeInhabitance".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "kernel_integer".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "bound".to_string(),
-                        ty: DeclarationId(893),
+                        ty: DeclarationId(896),
                     },
                     Field {
                         label: "type_realization".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                 ],
             },
@@ -22846,17 +22926,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 2521, 2718),
         });
         declarations.push(Declaration {
-            id: DeclarationId(893),
+            id: DeclarationId(896),
             name: Some("TargetIntegerInhabitanceBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BoundUnspecified".to_string(),
-                        ty: DeclarationId(1898),
+                        ty: DeclarationId(1902),
                     },
                     Field {
                         label: "StaticBoundFact".to_string(),
-                        ty: DeclarationId(1899),
+                        ty: DeclarationId(1903),
                     },
                 ],
             },
@@ -22871,7 +22951,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4149, 4237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(894),
+            id: DeclarationId(897),
             name: Some("FieldBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -22881,7 +22961,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "access".to_string(),
-                        ty: DeclarationId(895),
+                        ty: DeclarationId(898),
                     },
                     Field {
                         label: "borrowed_read".to_string(),
@@ -22900,17 +22980,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4239, 4323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(895),
+            id: DeclarationId(898),
             name: Some("FieldAccess".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DirectField".to_string(),
-                        ty: DeclarationId(1900),
+                        ty: DeclarationId(1904),
                     },
                     Field {
                         label: "AccessorMethod".to_string(),
-                        ty: DeclarationId(1901),
+                        ty: DeclarationId(1905),
                     },
                 ],
             },
@@ -22925,21 +23005,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4706, 4773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(896),
+            id: DeclarationId(899),
             name: Some("OperatorRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "op".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -22962,17 +23042,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4775, 4906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(897),
+            id: DeclarationId(900),
             name: Some("BehaviorRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -22995,25 +23075,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4908, 5018),
         });
         declarations.push(Declaration {
-            id: DeclarationId(898),
+            id: DeclarationId(901),
             name: Some("CallableRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(906),
+                        ty: DeclarationId(909),
                     },
                     Field {
                         label: "parameters".to_string(),
-                        ty: DeclarationId(1902),
+                        ty: DeclarationId(1906),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -23032,7 +23112,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5020, 5179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(899),
+            id: DeclarationId(902),
             name: Some("CallableParameter".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23042,7 +23122,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "disposition".to_string(),
-                        ty: DeclarationId(900),
+                        ty: DeclarationId(903),
                     },
                 ],
             },
@@ -23057,17 +23137,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5601, 5675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(900),
+            id: DeclarationId(903),
             name: Some("ParameterDisposition".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(1903),
+                        ty: DeclarationId(1907),
                     },
                     Field {
                         label: "Consumed".to_string(),
-                        ty: DeclarationId(1904),
+                        ty: DeclarationId(1908),
                     },
                 ],
             },
@@ -23082,17 +23162,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6132, 6183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(901),
+            id: DeclarationId(904),
             name: Some("StringOwnershipAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Owned".to_string(),
-                        ty: DeclarationId(1905),
+                        ty: DeclarationId(1909),
                     },
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(1906),
+                        ty: DeclarationId(1910),
                     },
                 ],
             },
@@ -23107,17 +23187,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6595, 6642),
         });
         declarations.push(Declaration {
-            id: DeclarationId(902),
+            id: DeclarationId(905),
             name: Some("StringLifetimeAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SelfContained".to_string(),
-                        ty: DeclarationId(1907),
+                        ty: DeclarationId(1911),
                     },
                     Field {
                         label: "Caller".to_string(),
-                        ty: DeclarationId(1908),
+                        ty: DeclarationId(1912),
                     },
                 ],
             },
@@ -23132,21 +23212,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6950, 7002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(903),
+            id: DeclarationId(906),
             name: Some("StringGrowabilityAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Growable".to_string(),
-                        ty: DeclarationId(1909),
+                        ty: DeclarationId(1913),
                     },
                     Field {
                         label: "Fixed".to_string(),
-                        ty: DeclarationId(1910),
+                        ty: DeclarationId(1914),
                     },
                     Field {
                         label: "NotApplicable".to_string(),
-                        ty: DeclarationId(1911),
+                        ty: DeclarationId(1915),
                     },
                 ],
             },
@@ -23161,12 +23241,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7229, 7296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(904),
+            id: DeclarationId(907),
             name: Some("StringEncodingAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Utf8FreeMonoidChar".to_string(),
-                    ty: DeclarationId(1912),
+                    ty: DeclarationId(1916),
                 }],
             },
             type_params: vec![],
@@ -23180,17 +23260,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7605, 7651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(905),
+            id: DeclarationId(908),
             name: Some("TypeInstantiationRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -23213,49 +23293,49 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7653, 7772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(906),
+            id: DeclarationId(909),
             name: Some("CallableStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ListEmpty".to_string(),
-                        ty: DeclarationId(1913),
+                        ty: DeclarationId(1917),
                     },
                     Field {
                         label: "ListSingleton".to_string(),
-                        ty: DeclarationId(1914),
+                        ty: DeclarationId(1918),
                     },
                     Field {
                         label: "ListCons".to_string(),
-                        ty: DeclarationId(1915),
+                        ty: DeclarationId(1919),
                     },
                     Field {
                         label: "ListConcat".to_string(),
-                        ty: DeclarationId(1916),
+                        ty: DeclarationId(1920),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(1917),
+                        ty: DeclarationId(1921),
                     },
                     Field {
                         label: "ListIsEmpty".to_string(),
-                        ty: DeclarationId(1918),
+                        ty: DeclarationId(1922),
                     },
                     Field {
                         label: "ListFold".to_string(),
-                        ty: DeclarationId(1919),
+                        ty: DeclarationId(1923),
                     },
                     Field {
                         label: "ListMap".to_string(),
-                        ty: DeclarationId(1920),
+                        ty: DeclarationId(1924),
                     },
                     Field {
                         label: "ListFilter".to_string(),
-                        ty: DeclarationId(1921),
+                        ty: DeclarationId(1925),
                     },
                     Field {
                         label: "ListContains".to_string(),
-                        ty: DeclarationId(1922),
+                        ty: DeclarationId(1926),
                     },
                 ],
             },
@@ -23270,29 +23350,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8177, 8346),
         });
         declarations.push(Declaration {
-            id: DeclarationId(907),
+            id: DeclarationId(910),
             name: Some("PatternRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(908),
+                        ty: DeclarationId(911),
                     },
                     Field {
                         label: "empty_variant".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "cons_variant".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "scrutinee".to_string(),
@@ -23331,17 +23411,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 10285, 10574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(908),
+            id: DeclarationId(911),
             name: Some("PatternStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PlaceholderPatternStrategy".to_string(),
-                        ty: DeclarationId(1923),
+                        ty: DeclarationId(1927),
                     },
                     Field {
                         label: "VectorList".to_string(),
-                        ty: DeclarationId(1924),
+                        ty: DeclarationId(1928),
                     },
                 ],
             },
@@ -23356,7 +23436,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11014, 11080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(909),
+            id: DeclarationId(912),
             name: Some("StatementSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23381,7 +23461,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11082, 11159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(910),
+            id: DeclarationId(913),
             name: Some("ExpressionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23410,7 +23490,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11161, 11251),
         });
         declarations.push(Declaration {
-            id: DeclarationId(911),
+            id: DeclarationId(914),
             name: Some("ForEachSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23435,7 +23515,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11253, 11312),
         });
         declarations.push(Declaration {
-            id: DeclarationId(912),
+            id: DeclarationId(915),
             name: Some("ControlFlowSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23449,7 +23529,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "for_each_syntax".to_string(),
-                        ty: DeclarationId(911),
+                        ty: DeclarationId(914),
                     },
                 ],
             },
@@ -23464,7 +23544,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11314, 11411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(913),
+            id: DeclarationId(916),
             name: Some("LiteralSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23493,7 +23573,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11413, 11509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(914),
+            id: DeclarationId(917),
             name: Some("ModuleSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -23512,7 +23592,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11511, 11557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(915),
+            id: DeclarationId(918),
             name: Some("FunctionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23549,7 +23629,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11559, 11711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(916),
+            id: DeclarationId(919),
             name: Some("TypeApplicationSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -23568,7 +23648,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11713, 11762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(917),
+            id: DeclarationId(920),
             name: Some("TypeDefinitionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23605,7 +23685,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11976, 12124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(918),
+            id: DeclarationId(921),
             name: Some("RecordDeriveTemplateBundle".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23630,7 +23710,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12785, 12878),
         });
         declarations.push(Declaration {
-            id: DeclarationId(919),
+            id: DeclarationId(922),
             name: Some("PatternMatchSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23679,7 +23759,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 13582, 13822),
         });
         declarations.push(Declaration {
-            id: DeclarationId(920),
+            id: DeclarationId(923),
             name: Some("CollectionOps".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23736,7 +23816,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 13824, 14023),
         });
         declarations.push(Declaration {
-            id: DeclarationId(921),
+            id: DeclarationId(924),
             name: Some("ValueConstructionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23773,17 +23853,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 14025, 14211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(922),
+            id: DeclarationId(925),
             name: Some("RenderingModel".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(923),
+                        ty: DeclarationId(926),
                     },
                     Field {
                         label: "construct".to_string(),
-                        ty: DeclarationId(924),
+                        ty: DeclarationId(927),
                     },
                 ],
             },
@@ -23798,17 +23878,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 14213, 14288),
         });
         declarations.push(Declaration {
-            id: DeclarationId(923),
+            id: DeclarationId(926),
             name: Some("ReadStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Borrow".to_string(),
-                        ty: DeclarationId(1925),
+                        ty: DeclarationId(1929),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(1926),
+                        ty: DeclarationId(1930),
                     },
                 ],
             },
@@ -23823,17 +23903,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 14786, 14830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(924),
+            id: DeclarationId(927),
             name: Some("ConstructStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CopyOrClone".to_string(),
-                        ty: DeclarationId(1927),
+                        ty: DeclarationId(1931),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(1928),
+                        ty: DeclarationId(1932),
                     },
                 ],
             },
@@ -23848,57 +23928,57 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 15123, 15177),
         });
         declarations.push(Declaration {
-            id: DeclarationId(925),
+            id: DeclarationId(928),
             name: Some("LanguageSpec".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "statements".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "expressions".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "control_flow".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "literals".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "modules".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "functions".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "type_applications".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "type_definitions".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "record_derive_templates".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "patterns".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "collection_ops".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "values".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                 ],
             },
@@ -23913,17 +23993,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 15179, 15705),
         });
         declarations.push(Declaration {
-            id: DeclarationId(926),
+            id: DeclarationId(929),
             name: Some("PlaceholderConvention".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IndexedArgs".to_string(),
-                        ty: DeclarationId(1929),
+                        ty: DeclarationId(1933),
                     },
                     Field {
                         label: "NamedArg".to_string(),
-                        ty: DeclarationId(1930),
+                        ty: DeclarationId(1934),
                     },
                 ],
             },
@@ -23938,17 +24018,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17079, 17134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(927),
+            id: DeclarationId(930),
             name: Some("MethodEmitTemplate".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SingleTemplate".to_string(),
-                        ty: DeclarationId(1931),
+                        ty: DeclarationId(1935),
                     },
                     Field {
                         label: "HigherOrderTemplates".to_string(),
-                        ty: DeclarationId(1932),
+                        ty: DeclarationId(1936),
                     },
                 ],
             },
@@ -23963,7 +24043,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 18269, 18425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(928),
+            id: DeclarationId(931),
             name: Some("MethodTemplateContract".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23977,7 +24057,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "emit_template".to_string(),
-                        ty: DeclarationId(927),
+                        ty: DeclarationId(930),
                     },
                     Field {
                         label: "wraps_result".to_string(),
@@ -23985,7 +24065,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "placeholder_convention".to_string(),
-                        ty: DeclarationId(926),
+                        ty: DeclarationId(929),
                     },
                 ],
             },
@@ -24000,7 +24080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20218, 20405),
         });
         declarations.push(Declaration {
-            id: DeclarationId(929),
+            id: DeclarationId(932),
             name: Some("BootstrapFixture".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -24019,29 +24099,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1395, 1443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(930),
+            id: DeclarationId(933),
             name: Some("BootstrapFixtureSet".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "rust_pilot_primitives".to_string(),
-                        ty: DeclarationId(929),
+                        ty: DeclarationId(932),
                     },
                     Field {
                         label: "rust_method_template_contracts".to_string(),
-                        ty: DeclarationId(929),
+                        ty: DeclarationId(932),
                     },
                     Field {
                         label: "python_method_template_contracts".to_string(),
-                        ty: DeclarationId(929),
+                        ty: DeclarationId(932),
                     },
                     Field {
                         label: "go_method_template_contracts".to_string(),
-                        ty: DeclarationId(929),
+                        ty: DeclarationId(932),
                     },
                     Field {
                         label: "anthropic_operations".to_string(),
-                        ty: DeclarationId(929),
+                        ty: DeclarationId(932),
                     },
                 ],
             },
@@ -24056,15 +24136,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1600, 1864),
         });
         declarations.push(Declaration {
-            id: DeclarationId(931),
+            id: DeclarationId(934),
             name: Some("bootstrap_fixture_authority".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(930),
+                template: DeclarationId(933),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(930)),
+            meta_tag: Some(DeclarationId(933)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -24121,18 +24201,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1866, 2426),
         });
         declarations.push(Declaration {
-            id: DeclarationId(932),
+            id: DeclarationId(935),
             name: Some("go_method_template_contracts".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(928),
+                    value: DeclarationId(931),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1933)),
+            meta_tag: Some(DeclarationId(1937)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -24151,7 +24231,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -24164,7 +24244,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -24186,7 +24266,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Join({recv}, {arg})".to_string(),
                             ))],
@@ -24199,7 +24279,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -24221,7 +24301,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Split({recv}, {arg})".to_string(),
                             ))],
@@ -24234,7 +24314,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -24256,7 +24336,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({recv}, {arg}...)".to_string(),
                             ))],
@@ -24269,7 +24349,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -24291,7 +24371,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Map({recv}, {arg})".to_string(),
                             ))],
@@ -24304,7 +24384,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -24326,7 +24406,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Filter({recv}, {arg})".to_string(),
                             ))],
@@ -24339,7 +24419,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -24361,7 +24441,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Any({recv}, {arg})".to_string(),
                             ))],
@@ -24374,7 +24454,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -24396,7 +24476,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.All({recv}, {arg})".to_string(),
                             ))],
@@ -24409,7 +24489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -24431,7 +24511,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.FlatMap({recv}, {arg})".to_string(),
                             ))],
@@ -24444,7 +24524,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -24464,7 +24544,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -24477,7 +24557,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -24497,7 +24577,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -24510,7 +24590,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -24532,7 +24612,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Fold({recv}, {arg})".to_string(),
                             ))],
@@ -24545,7 +24625,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -24567,7 +24647,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.SortBy({recv}, {arg})".to_string(),
                             ))],
@@ -24580,7 +24660,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -24602,7 +24682,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({recv}, {arg})".to_string(),
                             ))],
@@ -24615,7 +24695,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -24626,29 +24706,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 2423, 5757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(933),
+            id: DeclarationId(936),
             name: Some("RecursionShape".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DirectRecursion".to_string(),
-                        ty: DeclarationId(1943),
+                        ty: DeclarationId(1947),
                     },
                     Field {
                         label: "ListRecursion".to_string(),
-                        ty: DeclarationId(1944),
+                        ty: DeclarationId(1948),
                     },
                     Field {
                         label: "OptionalRecursion".to_string(),
-                        ty: DeclarationId(1945),
+                        ty: DeclarationId(1949),
                     },
                     Field {
                         label: "SetRecursion".to_string(),
-                        ty: DeclarationId(1946),
+                        ty: DeclarationId(1950),
                     },
                     Field {
                         label: "MapValueRecursion".to_string(),
-                        ty: DeclarationId(1947),
+                        ty: DeclarationId(1951),
                     },
                 ],
             },
@@ -24663,7 +24743,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5538, 5811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(934),
+            id: DeclarationId(937),
             name: Some("InductiveField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -24681,7 +24761,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "shape".to_string(),
-                        ty: DeclarationId(933),
+                        ty: DeclarationId(936),
                     },
                     Field {
                         label: "element_type".to_string(),
@@ -24700,10 +24780,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 7103, 7525),
         });
         declarations.push(Declaration {
-            id: DeclarationId(935),
+            id: DeclarationId(938),
             name: Some("recursion_shape_eq".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(933), DeclarationId(933)],
+                inputs: vec![DeclarationId(936), DeclarationId(936)],
                 output: DeclarationId(99),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 7595, 7967)),
             },
@@ -24718,10 +24798,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 7527, 7967),
         });
         declarations.push(Declaration {
-            id: DeclarationId(936),
+            id: DeclarationId(939),
             name: Some("inductive_field_eq".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(934), DeclarationId(934)],
+                inputs: vec![DeclarationId(937), DeclarationId(937)],
                 output: DeclarationId(99),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8037, 8235)),
             },
@@ -24736,11 +24816,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 7969, 8235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(937),
+            id: DeclarationId(940),
             name: Some("inductive_field_to_dimension".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(934), DeclarationId(197)],
-                output: DeclarationId(1017),
+                inputs: vec![DeclarationId(937), DeclarationId(197)],
+                output: DeclarationId(1020),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8701, 8732)),
             },
             type_params: vec![],
@@ -24754,29 +24834,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 8611, 8732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(938),
+            id: DeclarationId(941),
             name: Some("SubValueRelation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "StrictSubValue".to_string(),
-                        ty: DeclarationId(1948),
+                        ty: DeclarationId(1952),
                     },
                     Field {
                         label: "IteratedSubValue".to_string(),
-                        ty: DeclarationId(1949),
+                        ty: DeclarationId(1953),
                     },
                     Field {
                         label: "ArithmeticDescent".to_string(),
-                        ty: DeclarationId(1950),
+                        ty: DeclarationId(1954),
                     },
                     Field {
                         label: "PreservedValue".to_string(),
-                        ty: DeclarationId(1951),
+                        ty: DeclarationId(1955),
                     },
                     Field {
                         label: "SubValueUnknown".to_string(),
-                        ty: DeclarationId(1952),
+                        ty: DeclarationId(1956),
                     },
                 ],
             },
@@ -24791,11 +24871,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 9878, 10114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(939),
+            id: DeclarationId(942),
             name: Some("sub_value_to_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(938)],
-                output: DeclarationId(1010),
+                inputs: vec![DeclarationId(941)],
+                output: DeclarationId(1013),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     11067,
@@ -24813,10 +24893,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10995, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(940),
+            id: DeclarationId(943),
             name: Some("shrink_factor_eq".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(831), DeclarationId(831)],
+                inputs: vec![DeclarationId(834), DeclarationId(834)],
                 output: DeclarationId(99),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -24835,11 +24915,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 12115, 12677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(941),
+            id: DeclarationId(944),
             name: Some("meet_sub_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(938), DeclarationId(938)],
-                output: DeclarationId(938),
+                inputs: vec![DeclarationId(941), DeclarationId(941)],
+                output: DeclarationId(941),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     13200,
@@ -24857,11 +24937,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 13120, 14612),
         });
         declarations.push(Declaration {
-            id: DeclarationId(942),
+            id: DeclarationId(945),
             name: Some("join_sub_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(938), DeclarationId(938)],
-                output: DeclarationId(938),
+                inputs: vec![DeclarationId(941), DeclarationId(941)],
+                output: DeclarationId(941),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     14944,
@@ -24879,11 +24959,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 14864, 16247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(943),
+            id: DeclarationId(946),
             name: Some("compose_sub_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(938), DeclarationId(934)],
-                output: DeclarationId(938),
+                inputs: vec![DeclarationId(941), DeclarationId(937)],
+                output: DeclarationId(941),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     17356,
@@ -24901,11 +24981,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 17268, 17478),
         });
         declarations.push(Declaration {
-            id: DeclarationId(944),
+            id: DeclarationId(947),
             name: Some("compose_sub_value_relations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(938), DeclarationId(938)],
-                output: DeclarationId(938),
+                inputs: vec![DeclarationId(941), DeclarationId(941)],
+                output: DeclarationId(941),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     18334,
@@ -24923,11 +25003,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 18226, 19680),
         });
         declarations.push(Declaration {
-            id: DeclarationId(945),
+            id: DeclarationId(948),
             name: Some("sub_value_to_call_pattern".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(938)],
-                output: DeclarationId(1934),
+                inputs: vec![DeclarationId(941)],
+                output: DeclarationId(1938),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     20455,
@@ -24945,11 +25025,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20382, 21251),
         });
         declarations.push(Declaration {
-            id: DeclarationId(946),
+            id: DeclarationId(949),
             name: Some("sub_value_to_lowering_target".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(938)],
-                output: DeclarationId(1935),
+                inputs: vec![DeclarationId(941)],
+                output: DeclarationId(1939),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     21843,
@@ -24967,25 +25047,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21764, 22748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(947),
+            id: DeclarationId(950),
             name: Some("PolynomialExponent".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerExpZero".to_string(),
-                        ty: DeclarationId(1953),
+                        ty: DeclarationId(1957),
                     },
                     Field {
                         label: "IntegerExpPos".to_string(),
-                        ty: DeclarationId(1954),
+                        ty: DeclarationId(1958),
                     },
                     Field {
                         label: "FractionExp".to_string(),
-                        ty: DeclarationId(1955),
+                        ty: DeclarationId(1959),
                     },
                     Field {
                         label: "LogBasedExp".to_string(),
-                        ty: DeclarationId(1956),
+                        ty: DeclarationId(1960),
                     },
                 ],
             },
@@ -25000,11 +25080,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 23991, 24246),
         });
         declarations.push(Declaration {
-            id: DeclarationId(948),
+            id: DeclarationId(951),
             name: Some("poly_exp_degree_one".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(947),
+                output: DeclarationId(950),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     24295,
@@ -25022,17 +25102,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24248, 24334),
         });
         declarations.push(Declaration {
-            id: DeclarationId(949),
+            id: DeclarationId(952),
             name: Some("AtomicCost".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PolyCost".to_string(),
-                        ty: DeclarationId(1957),
+                        ty: DeclarationId(1961),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(1958),
+                        ty: DeclarationId(1962),
                     },
                 ],
             },
@@ -25047,37 +25127,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24846, 24963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(950),
+            id: DeclarationId(953),
             name: Some("CostBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ConstantBound".to_string(),
-                        ty: DeclarationId(1959),
+                        ty: DeclarationId(1963),
                     },
                     Field {
                         label: "AtomicBound".to_string(),
-                        ty: DeclarationId(1960),
+                        ty: DeclarationId(1964),
                     },
                     Field {
                         label: "ProductBound".to_string(),
-                        ty: DeclarationId(1962),
+                        ty: DeclarationId(1966),
                     },
                     Field {
                         label: "SumOfProductsBound".to_string(),
-                        ty: DeclarationId(1965),
+                        ty: DeclarationId(1969),
                     },
                     Field {
                         label: "SumBound".to_string(),
-                        ty: DeclarationId(1967),
+                        ty: DeclarationId(1971),
                     },
                     Field {
                         label: "ForeverBound".to_string(),
-                        ty: DeclarationId(1968),
+                        ty: DeclarationId(1972),
                     },
                     Field {
                         label: "ErrorBound".to_string(),
-                        ty: DeclarationId(1969),
+                        ty: DeclarationId(1973),
                     },
                 ],
             },
@@ -25092,11 +25172,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26593, 27353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(951),
+            id: DeclarationId(954),
             name: Some("sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1936)],
-                output: DeclarationId(950),
+                inputs: vec![DeclarationId(1940)],
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     27764,
@@ -25114,10 +25194,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27714, 27870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(952),
+            id: DeclarationId(955),
             name: Some("cost_bound_is_sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(950)],
+                inputs: vec![DeclarationId(953)],
                 output: DeclarationId(99),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -25136,11 +25216,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 28145, 28447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(953),
+            id: DeclarationId(956),
             name: Some("cost_constant".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     28481,
@@ -25158,11 +25238,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 28449, 28498),
         });
         declarations.push(Declaration {
-            id: DeclarationId(954),
+            id: DeclarationId(957),
             name: Some("cost_linear".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     28542,
@@ -25180,11 +25260,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 28499, 28626),
         });
         declarations.push(Declaration {
-            id: DeclarationId(955),
+            id: DeclarationId(958),
             name: Some("cost_poly".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197), DeclarationId(81)],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     28681,
@@ -25202,11 +25282,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 28627, 29080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(956),
+            id: DeclarationId(959),
             name: Some("cost_root".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197), DeclarationId(81)],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29130,
@@ -25224,11 +25304,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29081, 29404),
         });
         declarations.push(Declaration {
-            id: DeclarationId(957),
+            id: DeclarationId(960),
             name: Some("cost_sqrt".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29446,
@@ -25246,11 +25326,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29405, 29479),
         });
         declarations.push(Declaration {
-            id: DeclarationId(958),
+            id: DeclarationId(961),
             name: Some("cost_cbrt".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29521,
@@ -25268,11 +25348,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29480, 29554),
         });
         declarations.push(Declaration {
-            id: DeclarationId(959),
+            id: DeclarationId(962),
             name: Some("cost_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29595,
@@ -25290,11 +25370,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29555, 29645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(960),
+            id: DeclarationId(963),
             name: Some("cost_nlogn".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29689,
@@ -25312,11 +25392,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29647, 29807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(961),
+            id: DeclarationId(964),
             name: Some("cost_graph_linear".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197), DeclarationId(197)],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29877,
@@ -25334,7 +25414,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29809, 30053),
         });
         declarations.push(Declaration {
-            id: DeclarationId(962),
+            id: DeclarationId(965),
             name: Some("RecurrenceForm".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -25367,11 +25447,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 31210, 31301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(963),
+            id: DeclarationId(966),
             name: Some("int_add_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(1937),
+                output: DeclarationId(1941),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     31892,
@@ -25389,11 +25469,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 31849, 32143),
         });
         declarations.push(Declaration {
-            id: DeclarationId(964),
+            id: DeclarationId(967),
             name: Some("int_mul_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(1938),
+                output: DeclarationId(1942),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     32188,
@@ -25411,11 +25491,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 32145, 32977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(965),
+            id: DeclarationId(968),
             name: Some("bounded_int_pow_exponent".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(1939),
+                output: DeclarationId(1943),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33437,
@@ -25433,11 +25513,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33393, 33560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(966),
+            id: DeclarationId(969),
             name: Some("int_pow_bounded".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(1940),
+                output: DeclarationId(1944),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33912,
@@ -25455,11 +25535,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33864, 34957),
         });
         declarations.push(Declaration {
-            id: DeclarationId(967),
+            id: DeclarationId(970),
             name: Some("ceil_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(1941),
+                output: DeclarationId(1945),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35175,
@@ -25477,7 +25557,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35129, 35290),
         });
         declarations.push(Declaration {
-            id: DeclarationId(968),
+            id: DeclarationId(971),
             name: Some("ceil_log_iter".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
@@ -25486,7 +25566,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     DeclarationId(81),
                     DeclarationId(81),
                 ],
-                output: DeclarationId(1942),
+                output: DeclarationId(1946),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35447,
@@ -25504,11 +25584,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35376, 35809),
         });
         declarations.push(Declaration {
-            id: DeclarationId(969),
+            id: DeclarationId(972),
             name: Some("master_theorem".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(962)],
-                output: DeclarationId(950),
+                inputs: vec![DeclarationId(965)],
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35864,
@@ -25526,11 +25606,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35811, 37901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(970),
+            id: DeclarationId(973),
             name: Some("catamorphism_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197), DeclarationId(81)],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     38254,
@@ -25548,16 +25628,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 38184, 38412),
         });
         declarations.push(Declaration {
-            id: DeclarationId(971),
+            id: DeclarationId(974),
             name: Some("derive_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
                     DeclarationId(197),
                     DeclarationId(81),
-                    DeclarationId(831),
+                    DeclarationId(834),
                     DeclarationId(81),
                 ],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     38911,
@@ -25575,11 +25655,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 38810, 39935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(972),
+            id: DeclarationId(975),
             name: Some("tree_traversal_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     40268,
@@ -25597,11 +25677,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 40229, 40325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(973),
+            id: DeclarationId(976),
             name: Some("nested_iteration_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     40368,
@@ -25619,11 +25699,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 40327, 40426),
         });
         declarations.push(Declaration {
-            id: DeclarationId(974),
+            id: DeclarationId(977),
             name: Some("linear_scan_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     40526,
@@ -25641,11 +25721,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 40490, 40581),
         });
         declarations.push(Declaration {
-            id: DeclarationId(975),
+            id: DeclarationId(978),
             name: Some("binary_search_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     40778,
@@ -25663,11 +25743,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 40740, 40893),
         });
         declarations.push(Declaration {
-            id: DeclarationId(976),
+            id: DeclarationId(979),
             name: Some("mergesort_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     40973,
@@ -25685,11 +25765,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 40939, 41088),
         });
         declarations.push(Declaration {
-            id: DeclarationId(977),
+            id: DeclarationId(980),
             name: Some("karatsuba_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41255,
@@ -25707,11 +25787,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 41221, 41374),
         });
         declarations.push(Declaration {
-            id: DeclarationId(978),
+            id: DeclarationId(981),
             name: Some("strassen_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41539,
@@ -25729,11 +25809,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 41506, 41653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(979),
+            id: DeclarationId(982),
             name: Some("trial_division_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41770,
@@ -25751,11 +25831,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 41731, 41795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(980),
+            id: DeclarationId(983),
             name: Some("cube_root_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41830,
@@ -25773,11 +25853,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 41796, 41855),
         });
         declarations.push(Declaration {
-            id: DeclarationId(981),
+            id: DeclarationId(984),
             name: Some("kth_root_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41937,
@@ -25795,11 +25875,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 41898, 41968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(982),
+            id: DeclarationId(985),
             name: Some("bfs_dfs_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42204,
@@ -25817,11 +25897,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 42172, 42255),
         });
         declarations.push(Declaration {
-            id: DeclarationId(983),
+            id: DeclarationId(986),
             name: Some("dijkstra_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42346,
@@ -25839,11 +25919,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 42313, 42628),
         });
         declarations.push(Declaration {
-            id: DeclarationId(984),
+            id: DeclarationId(987),
             name: Some("bellman_ford_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42731,
@@ -25861,11 +25941,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 42694, 42891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(985),
+            id: DeclarationId(988),
             name: Some("floyd_warshall_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(950),
+                output: DeclarationId(953),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42998,
@@ -25883,18 +25963,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 42959, 43036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(986),
+            id: DeclarationId(989),
             name: Some("signed_int_diagnostic_order".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1063),
+                    value: DeclarationId(1066),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1970)),
+            meta_tag: Some(DeclarationId(1974)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -25909,18 +25989,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1200, 1304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(987),
+            id: DeclarationId(990),
             name: Some("unsigned_int_diagnostic_order".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1063),
+                    value: DeclarationId(1066),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1971)),
+            meta_tag: Some(DeclarationId(1975)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -25935,7 +26015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1378, 1489),
         });
         declarations.push(Declaration {
-            id: DeclarationId(988),
+            id: DeclarationId(991),
             name: Some("Lens".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -25945,27 +26025,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(1973),
+                        ty: DeclarationId(1977),
                     },
                     Field {
                         label: "sequential".to_string(),
-                        ty: DeclarationId(1974),
+                        ty: DeclarationId(1978),
                     },
                     Field {
                         label: "branch".to_string(),
-                        ty: DeclarationId(1975),
+                        ty: DeclarationId(1979),
                     },
                     Field {
                         label: "iterate".to_string(),
-                        ty: DeclarationId(1976),
+                        ty: DeclarationId(1980),
                     },
                     Field {
                         label: "validate".to_string(),
-                        ty: DeclarationId(1977),
+                        ty: DeclarationId(1981),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(989)],
+            type_params: vec![DeclarationId(992)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -25976,7 +26056,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(989),
+            id: DeclarationId(992),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("C".to_string())),
             type_params: vec![],
@@ -25990,21 +26070,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(990),
+            id: DeclarationId(993),
             name: Some("Lookup".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Miss".to_string(),
-                        ty: DeclarationId(1980),
+                        ty: DeclarationId(1984),
                     },
                     Field {
                         label: "Hit".to_string(),
-                        ty: DeclarationId(1981),
+                        ty: DeclarationId(1985),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(991)],
+            type_params: vec![DeclarationId(994)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -26015,7 +26095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4509, 4551),
         });
         declarations.push(Declaration {
-            id: DeclarationId(991),
+            id: DeclarationId(994),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("value".to_string())),
             type_params: vec![],
@@ -26029,11 +26109,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4509, 4551),
         });
         declarations.push(Declaration {
-            id: DeclarationId(992),
+            id: DeclarationId(995),
             name: Some("miss_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1978),
+                output: DeclarationId(1982),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4589, 4599)),
             },
             type_params: vec![],
@@ -26047,11 +26127,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4553, 4599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(993),
+            id: DeclarationId(996),
             name: Some("hit_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(1979),
+                output: DeclarationId(1983),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4642, 4654)),
             },
             type_params: vec![],
@@ -26065,18 +26145,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4601, 4654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(994),
+            id: DeclarationId(997),
             name: Some("python_method_template_contracts".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(928),
+                    value: DeclarationId(931),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1982)),
+            meta_tag: Some(DeclarationId(1986)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -26095,7 +26175,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -26108,7 +26188,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -26128,7 +26208,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg}.join({recv})".to_string(),
                             ))],
@@ -26141,7 +26221,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -26161,7 +26241,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}.split({arg})".to_string(),
                             ))],
@@ -26174,7 +26254,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -26196,7 +26276,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[-1] if {recv} else None".to_string(),
                             ))],
@@ -26209,7 +26289,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -26231,7 +26311,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[0] if {recv} else None".to_string(),
                             ))],
@@ -26244,7 +26324,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -26266,7 +26346,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "list(enumerate({recv}))".to_string(),
                             ))],
@@ -26279,7 +26359,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -26301,7 +26381,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[ord(c) for c in {recv}]".to_string(),
                             ))],
@@ -26314,7 +26394,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -26334,7 +26414,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv} + {arg}".to_string(),
                             ))],
@@ -26347,7 +26427,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -26369,7 +26449,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[{arg}(x) for x in {recv}]".to_string(),
                             ))],
@@ -26382,7 +26462,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -26404,7 +26484,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[x for x in {recv} if {arg}(x)]".to_string(),
                             ))],
@@ -26417,7 +26497,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -26439,7 +26519,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "any({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -26452,7 +26532,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -26474,7 +26554,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "all({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -26487,7 +26567,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -26509,7 +26589,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[y for x in {recv} for y in {arg}(x)]".to_string(),
                             ))],
@@ -26522,7 +26602,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -26542,7 +26622,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -26555,7 +26635,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -26575,7 +26655,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -26588,7 +26668,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -26610,7 +26690,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "functools.reduce({arg}, {recv})".to_string(),
                             ))],
@@ -26623,7 +26703,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -26645,7 +26725,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "sorted({recv}, key={arg})".to_string(),
                             ))],
@@ -26658,7 +26738,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -26678,7 +26758,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1931),
+                            constructor: DeclarationId(1935),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv} + [{arg}]".to_string(),
                             ))],
@@ -26691,7 +26771,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -26706,7 +26786,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(995),
+            id: DeclarationId(998),
             name: Some("ResourceHandle".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -26739,12 +26819,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/resources.dag", 739, 827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(996),
+            id: DeclarationId(999),
             name: Some("ResourceReference".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "target".to_string(),
-                    ty: DeclarationId(1063),
+                    ty: DeclarationId(1066),
                 }],
             },
             type_params: vec![],
@@ -26758,7 +26838,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/resources.dag", 829, 880),
         });
         declarations.push(Declaration {
-            id: DeclarationId(997),
+            id: DeclarationId(1000),
             name: Some("NamedField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -26768,7 +26848,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(998),
+                        ty: DeclarationId(1001),
                     },
                 ],
             },
@@ -26783,29 +26863,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 755, 805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(998),
+            id: DeclarationId(1001),
             name: Some("Value".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LiteralValue".to_string(),
-                        ty: DeclarationId(1983),
+                        ty: DeclarationId(1987),
                     },
                     Field {
                         label: "RecordValue".to_string(),
-                        ty: DeclarationId(1985),
+                        ty: DeclarationId(1989),
                     },
                     Field {
                         label: "VariantValue".to_string(),
-                        ty: DeclarationId(1986),
+                        ty: DeclarationId(1990),
                     },
                     Field {
                         label: "NodeRef".to_string(),
-                        ty: DeclarationId(1987),
+                        ty: DeclarationId(1991),
                     },
                     Field {
                         label: "CardinalityValue".to_string(),
-                        ty: DeclarationId(1988),
+                        ty: DeclarationId(1992),
                     },
                 ],
             },
@@ -26820,15 +26900,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2117, 2299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(999),
+            id: DeclarationId(1002),
             name: Some("ProgramObservation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "observed".to_string(),
-                    ty: DeclarationId(1000),
+                    ty: DeclarationId(1003),
                 }],
             },
-            type_params: vec![DeclarationId(1000)],
+            type_params: vec![DeclarationId(1003)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -26839,7 +26919,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 3203, 3259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1000),
+            id: DeclarationId(1003),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -26853,12 +26933,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 3203, 3259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1001),
+            id: DeclarationId(1004),
             name: Some("EvalFrame".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bindings".to_string(),
-                    ty: DeclarationId(1989),
+                    ty: DeclarationId(1993),
                 }],
             },
             type_params: vec![],
@@ -26872,12 +26952,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 3902, 3951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1002),
+            id: DeclarationId(1005),
             name: Some("EvalStateStack".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "frames".to_string(),
-                    ty: DeclarationId(1990),
+                    ty: DeclarationId(1994),
                 }],
             },
             type_params: vec![],
@@ -26891,12 +26971,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 4548, 4597),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1003),
+            id: DeclarationId(1006),
             name: Some("EvalStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "ApplicativeOrder".to_string(),
-                    ty: DeclarationId(1991),
+                    ty: DeclarationId(1995),
                 }],
             },
             type_params: vec![],
@@ -26910,12 +26990,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5002, 5076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1004),
+            id: DeclarationId(1007),
             name: Some("InputEvaluationOrder".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LeftFirst".to_string(),
-                    ty: DeclarationId(1992),
+                    ty: DeclarationId(1996),
                 }],
             },
             type_params: vec![],
@@ -26928,9 +27008,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/runtime.dag", 5313, 5350),
         });
-        declarations.push(Declaration { id: DeclarationId(1005), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(928) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1993)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1930), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(237)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1930), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(261)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1930), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(239)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1930), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1930), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1930), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1930), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1932), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1930), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1932), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1930), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1932), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1930), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1932), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1930), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(259)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1930), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1930), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) });
+        declarations.push(Declaration { id: DeclarationId(1008), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(931) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1997)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(237)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(261)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(239)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(259)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) });
         declarations.push(Declaration {
-            id: DeclarationId(1006),
+            id: DeclarationId(1009),
             name: Some("InputField".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -26944,7 +27024,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/services.dag", 3686, 3704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1007),
+            id: DeclarationId(1010),
             name: Some("RestEndpointBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -26969,12 +27049,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/services.dag", 4653, 4725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1008),
+            id: DeclarationId(1011),
             name: Some("CallableRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1063),
+                    ty: DeclarationId(1066),
                 }],
             },
             type_params: vec![],
@@ -26988,21 +27068,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/services.dag", 5533, 5576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1009),
+            id: DeclarationId(1012),
             name: Some("Operation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "callable".to_string(),
-                        ty: DeclarationId(1008),
+                        ty: DeclarationId(1011),
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1994),
+                        ty: DeclarationId(1998),
                     },
                     Field {
                         label: "endpoint".to_string(),
-                        ty: DeclarationId(1007),
+                        ty: DeclarationId(1010),
                     },
                 ],
             },
@@ -27017,21 +27097,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/services.dag", 6785, 6895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1010),
+            id: DeclarationId(1013),
             name: Some("DescentEvidence".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Strict".to_string(),
-                        ty: DeclarationId(2002),
+                        ty: DeclarationId(2006),
                     },
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2003),
+                        ty: DeclarationId(2007),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2004),
+                        ty: DeclarationId(2008),
                     },
                 ],
             },
@@ -27046,10 +27126,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 642, 710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1011),
+            id: DeclarationId(1014),
             name: Some("evidence_rank".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1010)],
+                inputs: vec![DeclarationId(1013)],
                 output: DeclarationId(81),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 756, 838)),
             },
@@ -27064,11 +27144,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 712, 838),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1012),
+            id: DeclarationId(1015),
             name: Some("merge_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1010), DeclarationId(1010)],
-                output: DeclarationId(1010),
+                inputs: vec![DeclarationId(1013), DeclarationId(1013)],
+                output: DeclarationId(1013),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 982, 1310)),
             },
             type_params: vec![],
@@ -27082,11 +27162,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 905, 1310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1013),
+            id: DeclarationId(1016),
             name: Some("join_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1010), DeclarationId(1010)],
-                output: DeclarationId(1010),
+                inputs: vec![DeclarationId(1013), DeclarationId(1013)],
+                output: DeclarationId(1013),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     1456,
@@ -27104,11 +27184,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 1380, 1655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1014),
+            id: DeclarationId(1017),
             name: Some("promote_to_strict".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1010)],
-                output: DeclarationId(1010),
+                inputs: vec![DeclarationId(1013)],
+                output: DeclarationId(1013),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2117,
@@ -27126,11 +27206,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2050, 2236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1015),
+            id: DeclarationId(1018),
             name: Some("optional_evidence_meet".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1995), DeclarationId(1996)],
-                output: DeclarationId(1997),
+                inputs: vec![DeclarationId(1999), DeclarationId(2000)],
+                output: DeclarationId(2001),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2388,
@@ -27148,11 +27228,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2300, 2564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1016),
+            id: DeclarationId(1019),
             name: Some("map_evidence_merge_at".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1998), DeclarationId(197), DeclarationId(1010)],
-                output: DeclarationId(1999),
+                inputs: vec![DeclarationId(2002), DeclarationId(197), DeclarationId(1013)],
+                output: DeclarationId(2003),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2733,
@@ -27170,29 +27250,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2601, 2907),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1017),
+            id: DeclarationId(1020),
             name: Some("RankingDimension".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2005),
+                        ty: DeclarationId(2009),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2006),
+                        ty: DeclarationId(2010),
                     },
                     Field {
                         label: "ArithmeticValue".to_string(),
-                        ty: DeclarationId(2007),
+                        ty: DeclarationId(2011),
                     },
                     Field {
                         label: "TokenPosition".to_string(),
-                        ty: DeclarationId(2008),
+                        ty: DeclarationId(2012),
                     },
                     Field {
                         label: "SetCardinality".to_string(),
-                        ty: DeclarationId(2009),
+                        ty: DeclarationId(2013),
                     },
                 ],
             },
@@ -27207,17 +27287,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3206, 3402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1018),
+            id: DeclarationId(1021),
             name: Some("PositiveDescentAmount".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OneStep".to_string(),
-                        ty: DeclarationId(2010),
+                        ty: DeclarationId(2014),
                     },
                     Field {
                         label: "AdditionalStep".to_string(),
-                        ty: DeclarationId(2011),
+                        ty: DeclarationId(2015),
                     },
                 ],
             },
@@ -27232,17 +27312,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4378, 4471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1019),
+            id: DeclarationId(1022),
             name: Some("ProportionalDivisor".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DivideByTwo".to_string(),
-                        ty: DeclarationId(2012),
+                        ty: DeclarationId(2016),
                     },
                     Field {
                         label: "StrictlyLarger".to_string(),
-                        ty: DeclarationId(2013),
+                        ty: DeclarationId(2017),
                     },
                 ],
             },
@@ -27257,10 +27337,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4937, 5027),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1020),
+            id: DeclarationId(1023),
             name: Some("proportional_divisor_to_int".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1019)],
+                inputs: vec![DeclarationId(1022)],
                 output: DeclarationId(81),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
@@ -27279,7 +27359,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5029, 5204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1021),
+            id: DeclarationId(1024),
             name: Some("peano_literal_materialization_cap".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
@@ -27301,11 +27381,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5388, 5441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1022),
+            id: DeclarationId(1025),
             name: Some("positive_descent_amount_from_positive_int".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2000),
+                output: DeclarationId(2004),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     5902,
@@ -27323,11 +27403,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5823, 6262),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1023),
+            id: DeclarationId(1026),
             name: Some("proportional_divisor_from_int_at_least_two".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2001),
+                output: DeclarationId(2005),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6342,
@@ -27345,37 +27425,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6264, 6703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1024),
+            id: DeclarationId(1027),
             name: Some("DescentSource".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ChildAccessor".to_string(),
-                        ty: DeclarationId(2014),
+                        ty: DeclarationId(2018),
                     },
                     Field {
                         label: "ListShrink".to_string(),
-                        ty: DeclarationId(2015),
+                        ty: DeclarationId(2019),
                     },
                     Field {
                         label: "ArithmeticSubtractDescent".to_string(),
-                        ty: DeclarationId(2016),
+                        ty: DeclarationId(2020),
                     },
                     Field {
                         label: "ArithmeticDivideDescent".to_string(),
-                        ty: DeclarationId(2017),
+                        ty: DeclarationId(2021),
                     },
                     Field {
                         label: "ParserAdvance".to_string(),
-                        ty: DeclarationId(2018),
+                        ty: DeclarationId(2022),
                     },
                     Field {
                         label: "SetRemoval".to_string(),
-                        ty: DeclarationId(2019),
+                        ty: DeclarationId(2023),
                     },
                     Field {
                         label: "FoldIteration".to_string(),
-                        ty: DeclarationId(2020),
+                        ty: DeclarationId(2024),
                     },
                 ],
             },
@@ -27390,12 +27470,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7108, 7429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1025),
+            id: DeclarationId(1028),
             name: Some("TerminationProof".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "dimensions".to_string(),
-                    ty: DeclarationId(2021),
+                    ty: DeclarationId(2025),
                 }],
             },
             type_params: vec![],
@@ -27409,7 +27489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7431, 7493),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1026),
+            id: DeclarationId(1029),
             name: Some("ProofEdge".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -27423,7 +27503,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(2022),
+                        ty: DeclarationId(2026),
                     },
                 ],
             },
@@ -27438,193 +27518,193 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7638, 7724),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1027),
+            id: DeclarationId(1030),
             name: Some("TokenKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2023),
+                        ty: DeclarationId(2027),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2024),
+                        ty: DeclarationId(2028),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2025),
+                        ty: DeclarationId(2029),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2026),
+                        ty: DeclarationId(2030),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2027),
+                        ty: DeclarationId(2031),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2028),
+                        ty: DeclarationId(2032),
                     },
                     Field {
                         label: "KwService".to_string(),
-                        ty: DeclarationId(2029),
+                        ty: DeclarationId(2033),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2030),
+                        ty: DeclarationId(2034),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2031),
+                        ty: DeclarationId(2035),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2032),
+                        ty: DeclarationId(2036),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2033),
+                        ty: DeclarationId(2037),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2034),
+                        ty: DeclarationId(2038),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2035),
+                        ty: DeclarationId(2039),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2036),
+                        ty: DeclarationId(2040),
                     },
                     Field {
                         label: "Ident".to_string(),
-                        ty: DeclarationId(2037),
+                        ty: DeclarationId(2041),
                     },
                     Field {
                         label: "IntLit".to_string(),
-                        ty: DeclarationId(2038),
+                        ty: DeclarationId(2042),
                     },
                     Field {
                         label: "StringLit".to_string(),
-                        ty: DeclarationId(2039),
+                        ty: DeclarationId(2043),
                     },
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2040),
+                        ty: DeclarationId(2044),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2041),
+                        ty: DeclarationId(2045),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2042),
+                        ty: DeclarationId(2046),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2043),
+                        ty: DeclarationId(2047),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2044),
+                        ty: DeclarationId(2048),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2045),
+                        ty: DeclarationId(2049),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2046),
+                        ty: DeclarationId(2050),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2047),
+                        ty: DeclarationId(2051),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2048),
+                        ty: DeclarationId(2052),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2049),
+                        ty: DeclarationId(2053),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2050),
+                        ty: DeclarationId(2054),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2051),
+                        ty: DeclarationId(2055),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2052),
+                        ty: DeclarationId(2056),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2053),
+                        ty: DeclarationId(2057),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2054),
+                        ty: DeclarationId(2058),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2055),
+                        ty: DeclarationId(2059),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2056),
+                        ty: DeclarationId(2060),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2057),
+                        ty: DeclarationId(2061),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2058),
+                        ty: DeclarationId(2062),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2059),
+                        ty: DeclarationId(2063),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2060),
+                        ty: DeclarationId(2064),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2061),
+                        ty: DeclarationId(2065),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2062),
+                        ty: DeclarationId(2066),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2063),
+                        ty: DeclarationId(2067),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2064),
+                        ty: DeclarationId(2068),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2065),
+                        ty: DeclarationId(2069),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2066),
+                        ty: DeclarationId(2070),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2067),
+                        ty: DeclarationId(2071),
                     },
                     Field {
                         label: "Eof".to_string(),
-                        ty: DeclarationId(2068),
+                        ty: DeclarationId(2072),
                     },
                 ],
             },
@@ -27639,13 +27719,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 627, 1151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1028),
+            id: DeclarationId(1031),
             name: Some("Token".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1027),
+                        ty: DeclarationId(1030),
                     },
                     Field {
                         label: "span".to_string(),
@@ -27664,65 +27744,65 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1286, 1337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1029),
+            id: DeclarationId(1032),
             name: Some("KeywordTokenKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2069),
+                        ty: DeclarationId(2073),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2070),
+                        ty: DeclarationId(2074),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2071),
+                        ty: DeclarationId(2075),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2072),
+                        ty: DeclarationId(2076),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2073),
+                        ty: DeclarationId(2077),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2074),
+                        ty: DeclarationId(2078),
                     },
                     Field {
                         label: "KwService".to_string(),
-                        ty: DeclarationId(2075),
+                        ty: DeclarationId(2079),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2076),
+                        ty: DeclarationId(2080),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2077),
+                        ty: DeclarationId(2081),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2078),
+                        ty: DeclarationId(2082),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2079),
+                        ty: DeclarationId(2083),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2080),
+                        ty: DeclarationId(2084),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2081),
+                        ty: DeclarationId(2085),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2082),
+                        ty: DeclarationId(2086),
                     },
                 ],
             },
@@ -27737,121 +27817,121 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1696, 1876),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1030),
+            id: DeclarationId(1033),
             name: Some("PunctTokenKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2083),
+                        ty: DeclarationId(2087),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2084),
+                        ty: DeclarationId(2088),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2085),
+                        ty: DeclarationId(2089),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2086),
+                        ty: DeclarationId(2090),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2087),
+                        ty: DeclarationId(2091),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2088),
+                        ty: DeclarationId(2092),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2089),
+                        ty: DeclarationId(2093),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2090),
+                        ty: DeclarationId(2094),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2091),
+                        ty: DeclarationId(2095),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2092),
+                        ty: DeclarationId(2096),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2093),
+                        ty: DeclarationId(2097),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2094),
+                        ty: DeclarationId(2098),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2095),
+                        ty: DeclarationId(2099),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2096),
+                        ty: DeclarationId(2100),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2097),
+                        ty: DeclarationId(2101),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2098),
+                        ty: DeclarationId(2102),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2099),
+                        ty: DeclarationId(2103),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2100),
+                        ty: DeclarationId(2104),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2101),
+                        ty: DeclarationId(2105),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2102),
+                        ty: DeclarationId(2106),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2103),
+                        ty: DeclarationId(2107),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2104),
+                        ty: DeclarationId(2108),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2105),
+                        ty: DeclarationId(2109),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2106),
+                        ty: DeclarationId(2110),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2107),
+                        ty: DeclarationId(2111),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2108),
+                        ty: DeclarationId(2112),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2109),
+                        ty: DeclarationId(2113),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2110),
+                        ty: DeclarationId(2114),
                     },
                 ],
             },
@@ -27866,7 +27946,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2292, 2598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1031),
+            id: DeclarationId(1034),
             name: Some("LocalPunctSpec".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -27876,7 +27956,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1030),
+                        ty: DeclarationId(1033),
                     },
                 ],
             },
@@ -27891,7 +27971,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2808, 2872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1032),
+            id: DeclarationId(1035),
             name: Some("StringEscapeSpec".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -27916,7 +27996,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 3259, 3325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1033),
+            id: DeclarationId(1036),
             name: Some("Path".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(131),
@@ -27933,7 +28013,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1340, 1360),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1034),
+            id: DeclarationId(1037),
             name: Some("SnapshotRef".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(122),
@@ -27950,7 +28030,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1361, 1391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1035),
+            id: DeclarationId(1038),
             name: Some("CensusListConstant".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -27964,15 +28044,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1528, 1554),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1036),
+            id: DeclarationId(1039),
             name: Some("expected_hand_authored_non_test".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1035),
+                template: DeclarationId(1038),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1035)),
+            meta_tag: Some(DeclarationId(1038)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -27981,15 +28061,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1556, 1617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1037),
+            id: DeclarationId(1040),
             name: Some("expected_hand_authored_test".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1035),
+                template: DeclarationId(1038),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1035)),
+            meta_tag: Some(DeclarationId(1038)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -27998,7 +28078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1618, 1675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1038),
+            id: DeclarationId(1041),
             name: Some("LensProducerFilesSubsetPredicate".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -28012,15 +28092,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1807, 1847),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1039),
+            id: DeclarationId(1042),
             name: Some("lens_producer_files_subset_predicate".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1038),
+                template: DeclarationId(1041),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1038)),
+            meta_tag: Some(DeclarationId(1041)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -28029,7 +28109,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1849, 1929),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1040),
+            id: DeclarationId(1043),
             name: Some("CompilerStdPositiveSetRatchet".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -28043,15 +28123,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2008, 2045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1041),
+            id: DeclarationId(1044),
             name: Some("compiler_std_positive_set_ratchet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1040),
+                template: DeclarationId(1043),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1040)),
+            meta_tag: Some(DeclarationId(1043)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -28060,37 +28140,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2047, 2121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1042),
+            id: DeclarationId(1045),
             name: Some("DiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2114),
+                        ty: DeclarationId(2118),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2115),
+                        ty: DeclarationId(2119),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2116),
+                        ty: DeclarationId(2120),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2117),
+                        ty: DeclarationId(2121),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2118),
+                        ty: DeclarationId(2122),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(2119),
+                        ty: DeclarationId(2123),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2120),
+                        ty: DeclarationId(2124),
                     },
                 ],
             },
@@ -28105,17 +28185,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2456, 2606),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1043),
+            id: DeclarationId(1046),
             name: Some("DiagnosticDetailExpectation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AnyDetail".to_string(),
-                        ty: DeclarationId(2121),
+                        ty: DeclarationId(2125),
                     },
                     Field {
                         label: "Contains".to_string(),
-                        ty: DeclarationId(2122),
+                        ty: DeclarationId(2126),
                     },
                 ],
             },
@@ -28130,17 +28210,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2975, 3042),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1044),
+            id: DeclarationId(1047),
             name: Some("DiagnosticReference".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1042),
+                        ty: DeclarationId(1045),
                     },
                     Field {
                         label: "detail_contains".to_string(),
-                        ty: DeclarationId(1043),
+                        ty: DeclarationId(1046),
                     },
                 ],
             },
@@ -28155,17 +28235,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3186, 3284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1045),
+            id: DeclarationId(1048),
             name: Some("PortStateExpectation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(2123),
+                        ty: DeclarationId(2127),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(2124),
+                        ty: DeclarationId(2128),
                     },
                 ],
             },
@@ -28180,21 +28260,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3671, 3724),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1046),
+            id: DeclarationId(1049),
             name: Some("AlgebraicLawKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Associativity".to_string(),
-                        ty: DeclarationId(2125),
+                        ty: DeclarationId(2129),
                     },
                     Field {
                         label: "Commutativity".to_string(),
-                        ty: DeclarationId(2126),
+                        ty: DeclarationId(2130),
                     },
                     Field {
                         label: "Identity".to_string(),
-                        ty: DeclarationId(2127),
+                        ty: DeclarationId(2131),
                     },
                 ],
             },
@@ -28209,97 +28289,97 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4513, 4583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1047),
+            id: DeclarationId(1050),
             name: Some("TestPredicate".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Compiles".to_string(),
-                        ty: DeclarationId(2128),
+                        ty: DeclarationId(2132),
                     },
                     Field {
                         label: "FailsWithDiagnostic".to_string(),
-                        ty: DeclarationId(2129),
+                        ty: DeclarationId(2133),
                     },
                     Field {
                         label: "OutputEquals".to_string(),
-                        ty: DeclarationId(2130),
+                        ty: DeclarationId(2134),
                     },
                     Field {
                         label: "PortHasState".to_string(),
-                        ty: DeclarationId(2131),
+                        ty: DeclarationId(2135),
                     },
                     Field {
                         label: "DeclarationHasRefinement".to_string(),
-                        ty: DeclarationId(2132),
+                        ty: DeclarationId(2136),
                     },
                     Field {
                         label: "CostBounded".to_string(),
-                        ty: DeclarationId(2133),
+                        ty: DeclarationId(2137),
                     },
                     Field {
                         label: "BehavioralObservation".to_string(),
-                        ty: DeclarationId(2134),
+                        ty: DeclarationId(2138),
                     },
                     Field {
                         label: "MockBackedInvariant".to_string(),
-                        ty: DeclarationId(2135),
+                        ty: DeclarationId(2139),
                     },
                     Field {
                         label: "ExecuteCommand".to_string(),
-                        ty: DeclarationId(2137),
+                        ty: DeclarationId(2141),
                     },
                     Field {
                         label: "ForAllTargets".to_string(),
-                        ty: DeclarationId(2139),
+                        ty: DeclarationId(2143),
                     },
                     Field {
                         label: "LensOutputEquals".to_string(),
-                        ty: DeclarationId(2140),
+                        ty: DeclarationId(2144),
                     },
                     Field {
                         label: "DifferentialEquals".to_string(),
-                        ty: DeclarationId(2141),
+                        ty: DeclarationId(2145),
                     },
                     Field {
                         label: "BinaryDimensionReportEquals".to_string(),
-                        ty: DeclarationId(2142),
+                        ty: DeclarationId(2146),
                     },
                     Field {
                         label: "AlgebraicLaw".to_string(),
-                        ty: DeclarationId(2143),
+                        ty: DeclarationId(2147),
                     },
                     Field {
                         label: "CensusBoundCheck".to_string(),
-                        ty: DeclarationId(2144),
+                        ty: DeclarationId(2148),
                     },
                     Field {
                         label: "CensusSubsetCount".to_string(),
-                        ty: DeclarationId(2145),
+                        ty: DeclarationId(2149),
                     },
                     Field {
                         label: "FixedPointConverges".to_string(),
-                        ty: DeclarationId(2146),
+                        ty: DeclarationId(2150),
                     },
                     Field {
                         label: "RatchetZero".to_string(),
-                        ty: DeclarationId(2147),
+                        ty: DeclarationId(2151),
                     },
                     Field {
                         label: "GeneratedFromDag".to_string(),
-                        ty: DeclarationId(2149),
+                        ty: DeclarationId(2153),
                     },
                     Field {
                         label: "ReleaseDeferredClaim".to_string(),
-                        ty: DeclarationId(2150),
+                        ty: DeclarationId(2154),
                     },
                     Field {
                         label: "SubstrateResearchDeferredClaim".to_string(),
-                        ty: DeclarationId(2151),
+                        ty: DeclarationId(2155),
                     },
                     Field {
                         label: "BridgeLedgerZero".to_string(),
-                        ty: DeclarationId(2152),
+                        ty: DeclarationId(2156),
                     },
                 ],
             },
@@ -28314,7 +28394,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4585, 12806),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1048),
+            id: DeclarationId(1051),
             name: Some("ProgramInput".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -28328,12 +28408,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 12914, 12934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1049),
+            id: DeclarationId(1052),
             name: Some("ProgramOutputBind".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "output_ref".to_string(),
-                    ty: DeclarationId(1063),
+                    ty: DeclarationId(1066),
                 }],
             },
             type_params: vec![],
@@ -28347,7 +28427,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 13077, 13132),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1050),
+            id: DeclarationId(1053),
             name: Some("TestClaim".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -28365,11 +28445,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "predicate".to_string(),
-                        ty: DeclarationId(1047),
+                        ty: DeclarationId(1050),
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2153),
+                        ty: DeclarationId(2157),
                     },
                 ],
             },
@@ -28384,7 +28464,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 13742, 13875),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1051),
+            id: DeclarationId(1054),
             name: Some("TestSuite".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -28394,7 +28474,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "claims".to_string(),
-                        ty: DeclarationId(2154),
+                        ty: DeclarationId(2158),
                     },
                 ],
             },
@@ -28409,7 +28489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 13877, 13936),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1052),
+            id: DeclarationId(1055),
             name: Some("TestObligation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -28419,7 +28499,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "resources".to_string(),
-                        ty: DeclarationId(2155),
+                        ty: DeclarationId(2159),
                     },
                 ],
             },
@@ -28434,11 +28514,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 14134, 14215),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1053),
+            id: DeclarationId(1056),
             name: Some("claim_obligation_resources".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1050)],
-                output: DeclarationId(2111),
+                inputs: vec![DeclarationId(1053)],
+                output: DeclarationId(2115),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     14657,
@@ -28456,11 +28536,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 14586, 14673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1054),
+            id: DeclarationId(1057),
             name: Some("obligation_for_claim".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1050)],
-                output: DeclarationId(1052),
+                inputs: vec![DeclarationId(1053)],
+                output: DeclarationId(1055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     14731,
@@ -28478,11 +28558,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 14675, 14816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1055),
+            id: DeclarationId(1058),
             name: Some("materialize_test_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2112)],
-                output: DeclarationId(2113),
+                inputs: vec![DeclarationId(2116)],
+                output: DeclarationId(2117),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     14899,
@@ -28500,11 +28580,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 14818, 14938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1056),
+            id: DeclarationId(1059),
             name: Some("behavior_spine".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744)],
-                output: DeclarationId(2156),
+                output: DeclarationId(2160),
                 body: ArrowBody::UserDefined(NodeId(240)),
             },
             type_params: vec![],
@@ -28518,7 +28598,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/workflows.dag", 963, 1018),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1057),
+            id: DeclarationId(1060),
             name: Some("ValueBehavior".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -28532,7 +28612,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2935, 2956),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1058),
+            id: DeclarationId(1061),
             name: Some("Transform".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -28546,7 +28626,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2957, 2974),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1059),
+            id: DeclarationId(1062),
             name: Some("Branch".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -28560,7 +28640,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2975, 2989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1060),
+            id: DeclarationId(1063),
             name: Some("Loop".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -28574,7 +28654,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2990, 3002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1061),
+            id: DeclarationId(1064),
             name: Some("Bind".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -28588,7 +28668,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3003, 3015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1062),
+            id: DeclarationId(1065),
             name: Some("Main".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -28602,7 +28682,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3016, 3028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1063),
+            id: DeclarationId(1066),
             name: Some("DeclarationRef".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -28616,15 +28696,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3761, 3783),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1064),
+            id: DeclarationId(1067),
             name: Some("go_execution_model".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(850),
+                template: DeclarationId(853),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(850)),
+            meta_tag: Some(DeclarationId(853)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -28632,14 +28712,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1840),
+                            constructor: DeclarationId(1844),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1843),
+                            constructor: DeclarationId(1847),
                             payload: vec![],
                         },
                     ),
@@ -28650,22 +28730,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 1630, 1732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1065),
+            id: DeclarationId(1068),
             name: Some("go_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(852),
+                template: DeclarationId(855),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(852)),
+            meta_tag: Some(DeclarationId(855)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "internal".to_string(),
-                        FieldValue::Reference(DeclarationId(853)),
+                        FieldValue::Reference(DeclarationId(856)),
                     ),
                     (
                         "additional_excluded_prefixes".to_string(),
@@ -28680,15 +28760,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 1734, 1884),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1066),
+            id: DeclarationId(1069),
             name: Some("go_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(854),
+                template: DeclarationId(857),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(854)),
+            meta_tag: Some(DeclarationId(857)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -28701,22 +28781,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 1886, 1961),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1067),
+            id: DeclarationId(1070),
             name: Some("go_int".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -28739,22 +28819,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 1963, 2093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1068),
+            id: DeclarationId(1071),
             name: Some("go_int32".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -28777,22 +28857,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 2095, 2229),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1069),
+            id: DeclarationId(1072),
             name: Some("go_integer_inhabit_i32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(892),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(892)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -28805,15 +28885,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1899),
+                            constructor: DeclarationId(1903),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1575),
+                                constructor: DeclarationId(1578),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(-2147483648)),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1574),
+                                        constructor: DeclarationId(1577),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1572),
+                                            constructor: DeclarationId(1575),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 4294967295,
                                             ))],
@@ -28825,7 +28905,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1068)),
+                        FieldValue::Reference(DeclarationId(1071)),
                     ),
                 ],
             }),
@@ -28834,22 +28914,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 2231, 2534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1070),
+            id: DeclarationId(1073),
             name: Some("go_bool".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -28872,22 +28952,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 2536, 2667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1071),
+            id: DeclarationId(1074),
             name: Some("go_string".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -28910,22 +28990,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 2669, 2806),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1072),
+            id: DeclarationId(1075),
             name: Some("go_node_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -28948,22 +29028,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 2808, 2946),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1073),
+            id: DeclarationId(1076),
             name: Some("go_port_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -28986,22 +29066,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 2948, 3086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1074),
+            id: DeclarationId(1077),
             name: Some("go_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -29024,22 +29104,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 3088, 3247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1075),
+            id: DeclarationId(1078),
             name: Some("go_cluster_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -29062,22 +29142,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 3249, 3396),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1076),
+            id: DeclarationId(1079),
             name: Some("go_type_shape".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -29101,7 +29181,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1900),
+                                    constructor: DeclarationId(1904),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -29121,22 +29201,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 3398, 3639),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1077),
+            id: DeclarationId(1080),
             name: Some("go_port_state".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -29159,22 +29239,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 3641, 3789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1078),
+            id: DeclarationId(1081),
             name: Some("go_port".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -29199,7 +29279,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -29218,7 +29298,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state".to_string(),
                                         ))],
@@ -29239,7 +29319,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -29260,22 +29340,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 3791, 4174),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1079),
+            id: DeclarationId(1082),
             name: Some("go_source_span".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -29300,7 +29380,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -29319,7 +29399,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -29338,7 +29418,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -29359,22 +29439,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 4176, 4570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1080),
+            id: DeclarationId(1083),
             name: Some("go_literal_bits".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -29397,22 +29477,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 4572, 4726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1081),
+            id: DeclarationId(1084),
             name: Some("go_atom_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -29435,22 +29515,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 4728, 4882),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1082),
+            id: DeclarationId(1085),
             name: Some("go_cardinality_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -29473,22 +29553,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 4884, 5053),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1083),
+            id: DeclarationId(1086),
             name: Some("go_interval".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -29511,22 +29591,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 5055, 5199),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1084),
+            id: DeclarationId(1087),
             name: Some("go_positive_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -29551,22 +29631,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 5201, 5386),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1085),
+            id: DeclarationId(1088),
             name: Some("go_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -29589,22 +29669,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 5388, 5548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1086),
+            id: DeclarationId(1089),
             name: Some("go_conj_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -29629,7 +29709,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -29648,7 +29728,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -29669,22 +29749,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 5550, 5852),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1087),
+            id: DeclarationId(1090),
             name: Some("go_template_argument".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -29711,7 +29791,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -29730,7 +29810,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -29751,22 +29831,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 5854, 6191),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1088),
+            id: DeclarationId(1091),
             name: Some("go_phantom_parameter".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -29793,7 +29873,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -29812,7 +29892,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -29833,22 +29913,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 6193, 6534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1089),
+            id: DeclarationId(1092),
             name: Some("go_nominal_opacity".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -29874,7 +29954,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1900),
+                                    constructor: DeclarationId(1904),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -29894,22 +29974,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 6536, 6808),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1090),
+            id: DeclarationId(1093),
             name: Some("go_field_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -29934,7 +30014,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -29953,7 +30033,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -29974,22 +30054,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 6810, 7121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1091),
+            id: DeclarationId(1094),
             name: Some("go_non_empty_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -30014,7 +30094,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -30033,7 +30113,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -30054,22 +30134,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 7123, 7439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1092),
+            id: DeclarationId(1095),
             name: Some("go_non_singleton_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -30094,7 +30174,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -30113,7 +30193,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -30132,7 +30212,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -30153,22 +30233,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 7441, 7850),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1093),
+            id: DeclarationId(1096),
             name: Some("go_param_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -30193,7 +30273,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1901),
+                                        constructor: DeclarationId(1905),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -30212,7 +30292,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1901),
+                                        constructor: DeclarationId(1905),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -30233,22 +30313,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 7852, 8168),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1094),
+            id: DeclarationId(1097),
             name: Some("go_transform_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -30272,7 +30352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1901),
+                                    constructor: DeclarationId(1905),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -30292,22 +30372,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 8170, 8411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1095),
+            id: DeclarationId(1098),
             name: Some("go_member_descent".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -30331,7 +30411,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1900),
+                                    constructor: DeclarationId(1904),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -30351,22 +30431,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 8413, 8654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1096),
+            id: DeclarationId(1099),
             name: Some("go_intra_cluster_call".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -30390,7 +30470,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1900),
+                                    constructor: DeclarationId(1904),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -30410,22 +30490,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 8656, 8915),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1097),
+            id: DeclarationId(1100),
             name: Some("go_cluster".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -30450,7 +30530,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -30471,7 +30551,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -30492,22 +30572,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 8917, 9250),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1098),
+            id: DeclarationId(1101),
             name: Some("go_field_value".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -30530,22 +30610,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 9252, 9403),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1099),
+            id: DeclarationId(1102),
             name: Some("go_value_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -30568,22 +30648,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 9405, 9553),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1100),
+            id: DeclarationId(1103),
             name: Some("go_arrow_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -30606,22 +30686,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 9555, 9703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1101),
+            id: DeclarationId(1104),
             name: Some("go_type_connective".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -30644,22 +30724,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 9705, 9868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1102),
+            id: DeclarationId(1105),
             name: Some("go_declaration".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -30684,7 +30764,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -30703,7 +30783,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -30724,7 +30804,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -30745,7 +30825,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -30766,7 +30846,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -30787,7 +30867,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -30808,7 +30888,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -30829,7 +30909,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -30850,7 +30930,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -30869,7 +30949,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -30890,22 +30970,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 9870, 10887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1103),
+            id: DeclarationId(1106),
             name: Some("go_arithmetic_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -30928,22 +31008,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 10889, 11046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1104),
+            id: DeclarationId(1107),
             name: Some("go_comparison_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -30966,22 +31046,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 11048, 11205),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1105),
+            id: DeclarationId(1108),
             name: Some("go_logical_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -31004,22 +31084,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 11207, 11355),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1106),
+            id: DeclarationId(1109),
             name: Some("go_operator_kind".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -31042,22 +31122,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 11357, 11514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1107),
+            id: DeclarationId(1110),
             name: Some("go_transform_target".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -31080,22 +31160,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 11516, 11682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1108),
+            id: DeclarationId(1111),
             name: Some("go_branch_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -31118,22 +31198,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 11684, 11844),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1109),
+            id: DeclarationId(1112),
             name: Some("go_payload_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -31160,7 +31240,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -31181,7 +31261,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -31202,22 +31282,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 11846, 12197),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1110),
+            id: DeclarationId(1113),
             name: Some("go_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -31242,7 +31322,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -31263,7 +31343,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -31282,7 +31362,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -31301,7 +31381,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -31322,22 +31402,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 12199, 12686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1111),
+            id: DeclarationId(1114),
             name: Some("go_loop_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -31360,22 +31440,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 12688, 12836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1112),
+            id: DeclarationId(1115),
             name: Some("go_value_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -31400,7 +31480,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -31419,7 +31499,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -31440,7 +31520,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -31459,7 +31539,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -31480,22 +31560,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 13310, 13784),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1113),
+            id: DeclarationId(1116),
             name: Some("go_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -31520,7 +31600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -31539,7 +31619,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -31558,7 +31638,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -31579,7 +31659,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -31598,7 +31678,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -31619,22 +31699,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 13786, 14351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1114),
+            id: DeclarationId(1117),
             name: Some("go_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -31659,7 +31739,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -31678,7 +31758,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -31697,7 +31777,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -31718,7 +31798,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -31737,7 +31817,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -31758,7 +31838,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -31779,22 +31859,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 14353, 15010),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1115),
+            id: DeclarationId(1118),
             name: Some("go_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -31819,7 +31899,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -31838,7 +31918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -31857,7 +31937,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -31876,7 +31956,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -31895,7 +31975,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -31916,7 +31996,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -31935,7 +32015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -31956,22 +32036,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 15012, 15714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1116),
+            id: DeclarationId(1119),
             name: Some("go_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -31996,7 +32076,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -32015,7 +32095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -32036,7 +32116,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -32055,7 +32135,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -32074,7 +32154,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -32095,7 +32175,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -32116,22 +32196,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 15716, 16367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1117),
+            id: DeclarationId(1120),
             name: Some("go_behavior".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -32154,22 +32234,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 16369, 16513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1118),
+            id: DeclarationId(1121),
             name: Some("go_dag".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -32196,7 +32276,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -32215,7 +32295,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -32234,7 +32314,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -32255,7 +32335,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -32276,15 +32356,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 16515, 16982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1119),
+            id: DeclarationId(1122),
             name: Some("go_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -32297,15 +32377,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 17285, 17526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1120),
+            id: DeclarationId(1123),
             name: Some("go_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -32318,15 +32398,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 17528, 17682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1121),
+            id: DeclarationId(1124),
             name: Some("go_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -32339,15 +32419,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 17684, 18082),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1122),
+            id: DeclarationId(1125),
             name: Some("go_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -32360,15 +32440,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 18084, 18393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1123),
+            id: DeclarationId(1126),
             name: Some("go_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -32381,15 +32461,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 18395, 18797),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1124),
+            id: DeclarationId(1127),
             name: Some("go_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -32402,15 +32482,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 18799, 18962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1125),
+            id: DeclarationId(1128),
             name: Some("go_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -32423,15 +32503,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 18964, 19118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1126),
+            id: DeclarationId(1129),
             name: Some("go_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -32444,15 +32524,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 19120, 19531),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1127),
+            id: DeclarationId(1130),
             name: Some("go_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -32465,15 +32545,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 19533, 20018),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1128),
+            id: DeclarationId(1131),
             name: Some("go_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -32486,15 +32566,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 20020, 20426),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1129),
+            id: DeclarationId(1132),
             name: Some("go_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -32507,15 +32587,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 20428, 20846),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1130),
+            id: DeclarationId(1133),
             name: Some("go_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -32528,15 +32608,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 20848, 21011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1131),
+            id: DeclarationId(1134),
             name: Some("go_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -32549,15 +32629,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 21013, 21176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1132),
+            id: DeclarationId(1135),
             name: Some("go_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -32570,22 +32650,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 21178, 21332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1133),
+            id: DeclarationId(1136),
             name: Some("go_int_add".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -32604,22 +32684,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 21334, 21475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1134),
+            id: DeclarationId(1137),
             name: Some("go_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -32638,22 +32718,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 21477, 21618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1135),
+            id: DeclarationId(1138),
             name: Some("go_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -32672,22 +32752,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 21620, 21761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1136),
+            id: DeclarationId(1139),
             name: Some("go_int_div".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -32708,22 +32788,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 21763, 21911),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1137),
+            id: DeclarationId(1140),
             name: Some("go_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -32742,22 +32822,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 21913, 22053),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1138),
+            id: DeclarationId(1141),
             name: Some("go_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -32776,22 +32856,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 22055, 22202),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1139),
+            id: DeclarationId(1142),
             name: Some("go_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -32810,22 +32890,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 22204, 22351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1140),
+            id: DeclarationId(1143),
             name: Some("go_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -32844,22 +32924,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 22353, 22514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1141),
+            id: DeclarationId(1144),
             name: Some("go_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -32878,22 +32958,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 22516, 22656),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1142),
+            id: DeclarationId(1145),
             name: Some("go_node_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -32912,22 +32992,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 22658, 22805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1143),
+            id: DeclarationId(1146),
             name: Some("go_port_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -32946,22 +33026,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 22807, 22954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1144),
+            id: DeclarationId(1147),
             name: Some("go_declaration_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -32980,22 +33060,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 22956, 23117),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1145),
+            id: DeclarationId(1148),
             name: Some("go_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -33014,22 +33094,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 23119, 23258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1146),
+            id: DeclarationId(1149),
             name: Some("go_int_le".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -33048,22 +33128,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 23260, 23400),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1147),
+            id: DeclarationId(1150),
             name: Some("go_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -33082,22 +33162,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 23402, 23541),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1148),
+            id: DeclarationId(1151),
             name: Some("go_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -33116,22 +33196,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 23543, 23683),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1149),
+            id: DeclarationId(1152),
             name: Some("go_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -33150,22 +33230,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 23685, 23834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1150),
+            id: DeclarationId(1153),
             name: Some("go_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -33184,26 +33264,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 23836, 23985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1151),
+            id: DeclarationId(1154),
             name: Some("go_let_stmt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(897),
+                template: DeclarationId(900),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(897)),
+            meta_tag: Some(DeclarationId(900)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1061)),
+                        FieldValue::Reference(DeclarationId(1064)),
                     ),
                     (
                         "carrier".to_string(),
@@ -33219,26 +33299,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 23987, 24120),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1152),
+            id: DeclarationId(1155),
             name: Some("go_if_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(897),
+                template: DeclarationId(900),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(897)),
+            meta_tag: Some(DeclarationId(900)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1059)),
+                        FieldValue::Reference(DeclarationId(1062)),
                     ),
                     (
                         "carrier".to_string(),
@@ -33254,26 +33334,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 24122, 24265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1153),
+            id: DeclarationId(1156),
             name: Some("go_main_wrap".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(897),
+                template: DeclarationId(900),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(897)),
+            meta_tag: Some(DeclarationId(900)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1062)),
+                        FieldValue::Reference(DeclarationId(1065)),
                     ),
                     (
                         "carrier".to_string(),
@@ -33289,22 +33369,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 24267, 24420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1154),
+            id: DeclarationId(1157),
             name: Some("go_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -33313,7 +33393,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1913),
+                            constructor: DeclarationId(1917),
                             payload: vec![],
                         },
                     ),
@@ -33326,22 +33406,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 24422, 24560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1155),
+            id: DeclarationId(1158),
             name: Some("go_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -33350,7 +33430,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1914),
+                            constructor: DeclarationId(1918),
                             payload: vec![],
                         },
                     ),
@@ -33361,7 +33441,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1904),
+                                    constructor: DeclarationId(1908),
                                     payload: vec![],
                                 },
                             ),
@@ -33375,22 +33455,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 24562, 24754),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1156),
+            id: DeclarationId(1159),
             name: Some("go_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -33399,7 +33479,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1915),
+                            constructor: DeclarationId(1919),
                             payload: vec![],
                         },
                     ),
@@ -33411,7 +33491,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1904),
+                                        constructor: DeclarationId(1908),
                                         payload: vec![],
                                     },
                                 ),
@@ -33421,7 +33501,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1904),
+                                        constructor: DeclarationId(1908),
                                         payload: vec![],
                                     },
                                 ),
@@ -33436,22 +33516,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 24756, 24973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1157),
+            id: DeclarationId(1160),
             name: Some("go_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -33460,7 +33540,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1916),
+                            constructor: DeclarationId(1920),
                             payload: vec![],
                         },
                     ),
@@ -33472,7 +33552,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1904),
+                                        constructor: DeclarationId(1908),
                                         payload: vec![],
                                     },
                                 ),
@@ -33482,7 +33562,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1904),
+                                        constructor: DeclarationId(1908),
                                         payload: vec![],
                                     },
                                 ),
@@ -33497,22 +33577,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 24975, 25198),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1158),
+            id: DeclarationId(1161),
             name: Some("go_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -33521,7 +33601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1917),
+                            constructor: DeclarationId(1921),
                             payload: vec![],
                         },
                     ),
@@ -33532,7 +33612,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1903),
+                                    constructor: DeclarationId(1907),
                                     payload: vec![],
                                 },
                             ),
@@ -33546,22 +33626,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 25200, 25383),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1159),
+            id: DeclarationId(1162),
             name: Some("go_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(905),
+                template: DeclarationId(908),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(905)),
+            meta_tag: Some(DeclarationId(908)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -33579,22 +33659,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 25385, 25521),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1160),
+            id: DeclarationId(1163),
             name: Some("go_result_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(905),
+                template: DeclarationId(908),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(905)),
+            meta_tag: Some(DeclarationId(908)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -33614,22 +33694,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 26207, 26360),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1161),
+            id: DeclarationId(1164),
             name: Some("go_map_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(905),
+                template: DeclarationId(908),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(905)),
+            meta_tag: Some(DeclarationId(908)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -33647,22 +33727,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 26362, 26502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1162),
+            id: DeclarationId(1165),
             name: Some("go_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -33671,7 +33751,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1918),
+                            constructor: DeclarationId(1922),
                             payload: vec![],
                         },
                     ),
@@ -33682,7 +33762,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1903),
+                                    constructor: DeclarationId(1907),
                                     payload: vec![],
                                 },
                             ),
@@ -33696,22 +33776,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 26504, 26692),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1163),
+            id: DeclarationId(1166),
             name: Some("go_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -33720,7 +33800,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1919),
+                            constructor: DeclarationId(1923),
                             payload: vec![],
                         },
                     ),
@@ -33732,7 +33812,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -33742,7 +33822,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1904),
+                                        constructor: DeclarationId(1908),
                                         payload: vec![],
                                     },
                                 ),
@@ -33752,7 +33832,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -33767,22 +33847,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 26694, 26951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1164),
+            id: DeclarationId(1167),
             name: Some("go_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -33791,7 +33871,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1920),
+                            constructor: DeclarationId(1924),
                             payload: vec![],
                         },
                     ),
@@ -33803,7 +33883,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -33813,7 +33893,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -33828,22 +33908,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 26953, 27167),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1165),
+            id: DeclarationId(1168),
             name: Some("go_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -33852,7 +33932,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1921),
+                            constructor: DeclarationId(1925),
                             payload: vec![],
                         },
                     ),
@@ -33864,7 +33944,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -33874,7 +33954,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -33889,22 +33969,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 27169, 27392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1166),
+            id: DeclarationId(1169),
             name: Some("go_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -33913,7 +33993,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1922),
+                            constructor: DeclarationId(1926),
                             payload: vec![],
                         },
                     ),
@@ -33925,7 +34005,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -33935,7 +34015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -33950,22 +34030,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 27394, 27623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1167),
+            id: DeclarationId(1170),
             name: Some("go_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(907),
+                template: DeclarationId(910),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(907)),
+            meta_tag: Some(DeclarationId(910)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "target".to_string(),
@@ -33974,17 +34054,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1924),
+                            constructor: DeclarationId(1928),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1481)),
+                        FieldValue::Reference(DeclarationId(1484)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1483)),
+                        FieldValue::Reference(DeclarationId(1486)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -34014,15 +34094,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 27710, 28016),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1168),
+            id: DeclarationId(1171),
             name: Some("go_statements".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(912),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(912)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34044,15 +34124,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 28018, 28148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1169),
+            id: DeclarationId(1172),
             name: Some("go_expressions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(910),
+                template: DeclarationId(913),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(910)),
+            meta_tag: Some(DeclarationId(913)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34078,15 +34158,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 28150, 28310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1170),
+            id: DeclarationId(1173),
             name: Some("go_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(912),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(912)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34123,15 +34203,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 28312, 28513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1171),
+            id: DeclarationId(1174),
             name: Some("go_literals".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34155,15 +34235,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 28515, 28625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1172),
+            id: DeclarationId(1175),
             name: Some("go_modules".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(914),
+                template: DeclarationId(917),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(914)),
+            meta_tag: Some(DeclarationId(917)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34177,15 +34257,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 28627, 28684),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1173),
+            id: DeclarationId(1176),
             name: Some("go_functions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(918),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(918)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34223,15 +34303,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 28686, 28971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1174),
+            id: DeclarationId(1177),
             name: Some("go_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(916),
+                template: DeclarationId(919),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(916)),
+            meta_tag: Some(DeclarationId(919)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34245,15 +34325,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 28973, 29052),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1175),
+            id: DeclarationId(1178),
             name: Some("go_type_defs".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(917),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(917)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34289,15 +34369,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 29054, 29277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1176),
+            id: DeclarationId(1179),
             name: Some("go_patterns".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(919),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(919)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34343,15 +34423,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 29279, 29571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1177),
+            id: DeclarationId(1180),
             name: Some("go_collection_ops".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(920),
+                template: DeclarationId(923),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(920)),
+            meta_tag: Some(DeclarationId(923)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34417,15 +34497,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 29573, 30008),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1178),
+            id: DeclarationId(1181),
             name: Some("go_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(921),
+                template: DeclarationId(924),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(921)),
+            meta_tag: Some(DeclarationId(924)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34461,15 +34541,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 30010, 30278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1179),
+            id: DeclarationId(1182),
             name: Some("go_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(918),
+                template: DeclarationId(921),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(918)),
+            meta_tag: Some(DeclarationId(921)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34489,66 +34569,66 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 31035, 31150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1180),
+            id: DeclarationId(1183),
             name: Some("go_language".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(925),
+                template: DeclarationId(928),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(925)),
+            meta_tag: Some(DeclarationId(928)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1168)),
+                        FieldValue::Reference(DeclarationId(1171)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1169)),
+                        FieldValue::Reference(DeclarationId(1172)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1170)),
+                        FieldValue::Reference(DeclarationId(1173)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1171)),
+                        FieldValue::Reference(DeclarationId(1174)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1172)),
+                        FieldValue::Reference(DeclarationId(1175)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1173)),
+                        FieldValue::Reference(DeclarationId(1176)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1174)),
+                        FieldValue::Reference(DeclarationId(1177)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1175)),
+                        FieldValue::Reference(DeclarationId(1178)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1179)),
+                        FieldValue::Reference(DeclarationId(1182)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1176)),
+                        FieldValue::Reference(DeclarationId(1179)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1177)),
+                        FieldValue::Reference(DeclarationId(1180)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1178)),
+                        FieldValue::Reference(DeclarationId(1181)),
                     ),
                 ],
             }),
@@ -34557,15 +34637,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 31152, 31571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1181),
+            id: DeclarationId(1184),
             name: Some("go_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(824),
+                template: DeclarationId(827),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(824)),
+            meta_tag: Some(DeclarationId(827)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34593,15 +34673,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 33238, 33374),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1182),
+            id: DeclarationId(1185),
             name: Some("go_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(815),
+                template: DeclarationId(818),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(815)),
+            meta_tag: Some(DeclarationId(818)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34609,55 +34689,55 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1776),
+                            constructor: DeclarationId(1780),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1779),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1789),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1789),
+                            constructor: DeclarationId(1793),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1791),
+                            constructor: DeclarationId(1795),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1795),
+                            constructor: DeclarationId(1799),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1181)),
+                        FieldValue::Reference(DeclarationId(1184)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -34683,7 +34763,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1798),
+                                    constructor: DeclarationId(1802),
                                     payload: vec![],
                                 },
                             ),
@@ -34696,26 +34776,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 33376, 33934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1183),
+            id: DeclarationId(1186),
             name: Some("go_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(816),
+                template: DeclarationId(819),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(816)),
+            meta_tag: Some(DeclarationId(819)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1180)),
+                        FieldValue::Reference(DeclarationId(1183)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1182)),
+                        FieldValue::Reference(DeclarationId(1185)),
                     ),
                 ],
             }),
@@ -34724,15 +34804,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 33936, 34060),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1184),
+            id: DeclarationId(1187),
             name: Some("python_statements".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(912),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(912)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34752,15 +34832,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 1887, 2009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1185),
+            id: DeclarationId(1188),
             name: Some("python_expressions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(910),
+                template: DeclarationId(913),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(910)),
+            meta_tag: Some(DeclarationId(913)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34786,15 +34866,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 2011, 2164),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1186),
+            id: DeclarationId(1189),
             name: Some("python_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(912),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(912)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34831,15 +34911,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 2166, 2381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1187),
+            id: DeclarationId(1190),
             name: Some("python_literals".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34863,15 +34943,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 2383, 2497),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1188),
+            id: DeclarationId(1191),
             name: Some("python_modules".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(914),
+                template: DeclarationId(917),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(914)),
+            meta_tag: Some(DeclarationId(917)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34885,15 +34965,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 2499, 2560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1189),
+            id: DeclarationId(1192),
             name: Some("python_functions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(918),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(918)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34931,15 +35011,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 2562, 2869),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1190),
+            id: DeclarationId(1193),
             name: Some("python_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(916),
+                template: DeclarationId(919),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(916)),
+            meta_tag: Some(DeclarationId(919)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -34955,15 +35035,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 2871, 2970),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1191),
+            id: DeclarationId(1194),
             name: Some("python_type_definitions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(917),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(917)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35003,15 +35083,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 2972, 3303),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1192),
+            id: DeclarationId(1195),
             name: Some("python_patterns".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(919),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(919)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35057,15 +35137,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 3305, 3635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1193),
+            id: DeclarationId(1196),
             name: Some("python_collections".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(920),
+                template: DeclarationId(923),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(920)),
+            meta_tag: Some(DeclarationId(923)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35123,15 +35203,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 3637, 4026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1194),
+            id: DeclarationId(1197),
             name: Some("python_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(921),
+                template: DeclarationId(924),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(921)),
+            meta_tag: Some(DeclarationId(924)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35163,15 +35243,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 4028, 4280),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1195),
+            id: DeclarationId(1198),
             name: Some("python_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(918),
+                template: DeclarationId(921),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(918)),
+            meta_tag: Some(DeclarationId(921)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35191,66 +35271,66 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 4483, 4602),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1196),
+            id: DeclarationId(1199),
             name: Some("python_language".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(925),
+                template: DeclarationId(928),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(925)),
+            meta_tag: Some(DeclarationId(928)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1184)),
+                        FieldValue::Reference(DeclarationId(1187)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1185)),
+                        FieldValue::Reference(DeclarationId(1188)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1186)),
+                        FieldValue::Reference(DeclarationId(1189)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1187)),
+                        FieldValue::Reference(DeclarationId(1190)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1188)),
+                        FieldValue::Reference(DeclarationId(1191)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1189)),
+                        FieldValue::Reference(DeclarationId(1192)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1190)),
+                        FieldValue::Reference(DeclarationId(1193)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1191)),
+                        FieldValue::Reference(DeclarationId(1194)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1195)),
+                        FieldValue::Reference(DeclarationId(1198)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1192)),
+                        FieldValue::Reference(DeclarationId(1195)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1193)),
+                        FieldValue::Reference(DeclarationId(1196)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1194)),
+                        FieldValue::Reference(DeclarationId(1197)),
                     ),
                 ],
             }),
@@ -35259,15 +35339,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 4604, 5079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1197),
+            id: DeclarationId(1200),
             name: Some("python_target".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(850),
+                template: DeclarationId(853),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(850)),
+            meta_tag: Some(DeclarationId(853)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -35275,14 +35355,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1840),
+                            constructor: DeclarationId(1844),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1843),
+                            constructor: DeclarationId(1847),
                             payload: vec![],
                         },
                     ),
@@ -35293,22 +35373,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 5081, 5178),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1198),
+            id: DeclarationId(1201),
             name: Some("python_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(852),
+                template: DeclarationId(855),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(852)),
+            meta_tag: Some(DeclarationId(855)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "internal".to_string(),
-                        FieldValue::Reference(DeclarationId(853)),
+                        FieldValue::Reference(DeclarationId(856)),
                     ),
                     (
                         "additional_excluded_prefixes".to_string(),
@@ -35321,15 +35401,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 5180, 5316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1199),
+            id: DeclarationId(1202),
             name: Some("python_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(854),
+                template: DeclarationId(857),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(854)),
+            meta_tag: Some(DeclarationId(857)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -35342,22 +35422,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 5318, 5397),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1200),
+            id: DeclarationId(1203),
             name: Some("python_int".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -35380,22 +35460,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 5399, 5535),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1201),
+            id: DeclarationId(1204),
             name: Some("python_integer_inhabit_at_i32_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(892),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(892)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -35408,15 +35488,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1899),
+                            constructor: DeclarationId(1903),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1575),
+                                constructor: DeclarationId(1578),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(-2147483648)),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1574),
+                                        constructor: DeclarationId(1577),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1572),
+                                            constructor: DeclarationId(1575),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 4294967295,
                                             ))],
@@ -35428,7 +35508,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1200)),
+                        FieldValue::Reference(DeclarationId(1203)),
                     ),
                 ],
             }),
@@ -35437,22 +35517,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 5628, 5937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1202),
+            id: DeclarationId(1205),
             name: Some("python_integer_inhabit_unbounded_decl".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(892),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(892)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -35465,16 +35545,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1899),
+                            constructor: DeclarationId(1903),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1576),
+                                constructor: DeclarationId(1579),
                                 payload: vec![],
                             }],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1200)),
+                        FieldValue::Reference(DeclarationId(1203)),
                     ),
                 ],
             }),
@@ -35483,22 +35563,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 6015, 6225),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1203),
+            id: DeclarationId(1206),
             name: Some("python_bool".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -35521,22 +35601,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 6227, 6366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1204),
+            id: DeclarationId(1207),
             name: Some("python_string".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -35559,22 +35639,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 6368, 6510),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1205),
+            id: DeclarationId(1208),
             name: Some("python_node_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -35597,22 +35677,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 6512, 6658),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1206),
+            id: DeclarationId(1209),
             name: Some("python_port_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -35635,22 +35715,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 6660, 6806),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1207),
+            id: DeclarationId(1210),
             name: Some("python_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -35673,26 +35753,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 6808, 6975),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1208),
+            id: DeclarationId(1211),
             name: Some("python_declaration_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1063)),
+                        FieldValue::Reference(DeclarationId(1066)),
                     ),
                     (
                         "carrier".to_string(),
@@ -35711,22 +35791,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 6977, 7146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1209),
+            id: DeclarationId(1212),
             name: Some("python_source_span".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -35749,22 +35829,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 7148, 7307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1210),
+            id: DeclarationId(1213),
             name: Some("python_dag_port".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -35787,22 +35867,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 7309, 7459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1211),
+            id: DeclarationId(1214),
             name: Some("python_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -35825,22 +35905,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 7461, 7620),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1212),
+            id: DeclarationId(1215),
             name: Some("python_value_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -35863,22 +35943,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 7622, 7778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1213),
+            id: DeclarationId(1216),
             name: Some("python_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -35901,22 +35981,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 7780, 7948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1214),
+            id: DeclarationId(1217),
             name: Some("python_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -35939,22 +36019,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 7950, 8109),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1215),
+            id: DeclarationId(1218),
             name: Some("python_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -35977,22 +36057,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 8111, 8264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1216),
+            id: DeclarationId(1219),
             name: Some("python_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -36015,22 +36095,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 8266, 8419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1217),
+            id: DeclarationId(1220),
             name: Some("python_behavior".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -36053,22 +36133,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 8421, 8573),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1218),
+            id: DeclarationId(1221),
             name: Some("python_dag".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -36091,15 +36171,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 8575, 8712),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1219),
+            id: DeclarationId(1222),
             name: Some("python_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -36112,15 +36192,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 8786, 9035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1220),
+            id: DeclarationId(1223),
             name: Some("python_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -36133,15 +36213,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 9037, 9199),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1221),
+            id: DeclarationId(1224),
             name: Some("python_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -36154,15 +36234,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 9201, 9607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1222),
+            id: DeclarationId(1225),
             name: Some("python_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -36175,15 +36255,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 9609, 9926),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1223),
+            id: DeclarationId(1226),
             name: Some("python_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -36196,15 +36276,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 9928, 10338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1224),
+            id: DeclarationId(1227),
             name: Some("python_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -36217,15 +36297,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 10340, 10511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1225),
+            id: DeclarationId(1228),
             name: Some("python_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -36238,15 +36318,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 10513, 10675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1226),
+            id: DeclarationId(1229),
             name: Some("python_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -36259,15 +36339,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 10677, 11096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1227),
+            id: DeclarationId(1230),
             name: Some("python_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -36280,15 +36360,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 11098, 11591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1228),
+            id: DeclarationId(1231),
             name: Some("python_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -36301,15 +36381,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 11593, 12007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1229),
+            id: DeclarationId(1232),
             name: Some("python_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -36322,15 +36402,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 12009, 12435),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1230),
+            id: DeclarationId(1233),
             name: Some("python_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -36343,15 +36423,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 12437, 12608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1231),
+            id: DeclarationId(1234),
             name: Some("python_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -36364,15 +36444,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 12610, 12781),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1232),
+            id: DeclarationId(1235),
             name: Some("python_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -36385,22 +36465,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 12783, 12945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1233),
+            id: DeclarationId(1236),
             name: Some("python_int_add".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -36419,22 +36499,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 12947, 13096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1234),
+            id: DeclarationId(1237),
             name: Some("python_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -36453,22 +36533,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 13098, 13247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1235),
+            id: DeclarationId(1238),
             name: Some("python_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -36487,22 +36567,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 13249, 13398),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1236),
+            id: DeclarationId(1239),
             name: Some("python_int_div".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -36523,22 +36603,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 13400, 13559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1237),
+            id: DeclarationId(1240),
             name: Some("python_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -36557,22 +36637,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 13561, 13709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1238),
+            id: DeclarationId(1241),
             name: Some("python_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -36591,22 +36671,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 13711, 13866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1239),
+            id: DeclarationId(1242),
             name: Some("python_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -36625,22 +36705,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 13868, 14023),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1240),
+            id: DeclarationId(1243),
             name: Some("python_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -36659,22 +36739,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 14025, 14194),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1241),
+            id: DeclarationId(1244),
             name: Some("python_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -36693,22 +36773,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 14196, 14344),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1242),
+            id: DeclarationId(1245),
             name: Some("python_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -36727,22 +36807,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 14346, 14493),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1243),
+            id: DeclarationId(1246),
             name: Some("python_int_le".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -36761,22 +36841,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 14495, 14643),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1244),
+            id: DeclarationId(1247),
             name: Some("python_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -36795,22 +36875,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 14645, 14792),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1245),
+            id: DeclarationId(1248),
             name: Some("python_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -36829,22 +36909,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 14794, 14942),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1246),
+            id: DeclarationId(1249),
             name: Some("python_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -36863,22 +36943,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 14944, 15102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1247),
+            id: DeclarationId(1250),
             name: Some("python_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -36897,22 +36977,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 15104, 15261),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1248),
+            id: DeclarationId(1251),
             name: Some("python_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -36921,7 +37001,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1913),
+                            constructor: DeclarationId(1917),
                             payload: vec![],
                         },
                     ),
@@ -36934,22 +37014,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 15263, 15409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1249),
+            id: DeclarationId(1252),
             name: Some("python_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -36958,7 +37038,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1914),
+                            constructor: DeclarationId(1918),
                             payload: vec![],
                         },
                     ),
@@ -36969,7 +37049,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1904),
+                                    constructor: DeclarationId(1908),
                                     payload: vec![],
                                 },
                             ),
@@ -36983,22 +37063,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 15411, 15611),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1250),
+            id: DeclarationId(1253),
             name: Some("python_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -37007,7 +37087,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1915),
+                            constructor: DeclarationId(1919),
                             payload: vec![],
                         },
                     ),
@@ -37019,7 +37099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1904),
+                                        constructor: DeclarationId(1908),
                                         payload: vec![],
                                     },
                                 ),
@@ -37029,7 +37109,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1904),
+                                        constructor: DeclarationId(1908),
                                         payload: vec![],
                                     },
                                 ),
@@ -37044,22 +37124,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 15613, 15838),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1251),
+            id: DeclarationId(1254),
             name: Some("python_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -37068,7 +37148,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1916),
+                            constructor: DeclarationId(1920),
                             payload: vec![],
                         },
                     ),
@@ -37080,7 +37160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1904),
+                                        constructor: DeclarationId(1908),
                                         payload: vec![],
                                     },
                                 ),
@@ -37090,7 +37170,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1904),
+                                        constructor: DeclarationId(1908),
                                         payload: vec![],
                                     },
                                 ),
@@ -37105,22 +37185,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 15840, 16071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1252),
+            id: DeclarationId(1255),
             name: Some("python_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -37129,7 +37209,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1917),
+                            constructor: DeclarationId(1921),
                             payload: vec![],
                         },
                     ),
@@ -37140,7 +37220,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1903),
+                                    constructor: DeclarationId(1907),
                                     payload: vec![],
                                 },
                             ),
@@ -37154,22 +37234,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 16073, 16264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1253),
+            id: DeclarationId(1256),
             name: Some("python_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -37178,7 +37258,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1918),
+                            constructor: DeclarationId(1922),
                             payload: vec![],
                         },
                     ),
@@ -37189,7 +37269,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1903),
+                                    constructor: DeclarationId(1907),
                                     payload: vec![],
                                 },
                             ),
@@ -37203,22 +37283,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 16266, 16462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1254),
+            id: DeclarationId(1257),
             name: Some("python_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -37227,7 +37307,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1919),
+                            constructor: DeclarationId(1923),
                             payload: vec![],
                         },
                     ),
@@ -37239,7 +37319,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -37249,7 +37329,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1904),
+                                        constructor: DeclarationId(1908),
                                         payload: vec![],
                                     },
                                 ),
@@ -37259,7 +37339,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -37274,22 +37354,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 16464, 16729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1255),
+            id: DeclarationId(1258),
             name: Some("python_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -37298,7 +37378,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1920),
+                            constructor: DeclarationId(1924),
                             payload: vec![],
                         },
                     ),
@@ -37310,7 +37390,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -37320,7 +37400,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -37335,22 +37415,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 16731, 16953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1256),
+            id: DeclarationId(1259),
             name: Some("python_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -37359,7 +37439,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1921),
+                            constructor: DeclarationId(1925),
                             payload: vec![],
                         },
                     ),
@@ -37371,7 +37451,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -37381,7 +37461,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -37396,22 +37476,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 16955, 17186),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1257),
+            id: DeclarationId(1260),
             name: Some("python_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -37420,7 +37500,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1922),
+                            constructor: DeclarationId(1926),
                             payload: vec![],
                         },
                     ),
@@ -37432,7 +37512,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -37442,7 +37522,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -37457,22 +37537,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 17188, 17425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1258),
+            id: DeclarationId(1261),
             name: Some("python_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(905),
+                template: DeclarationId(908),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(905)),
+            meta_tag: Some(DeclarationId(908)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -37489,24 +37569,24 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/spec/python.dag", 17427, 17575),
         });
-        declarations.push(Declaration { id: DeclarationId(1259), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(905)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1196))), ("target".to_string(), FieldValue::Reference(DeclarationId(11))), ("carrier".to_string(), FieldValue::Literal(LiteralBits::String("typing.Union[typing.Tuple[typing.Literal['Ok'], {key}], typing.Tuple[typing.Literal['Err'], {value}]]".to_string()))), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1)))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 17691, 17929) });
+        declarations.push(Declaration { id: DeclarationId(1262), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(908)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1199))), ("target".to_string(), FieldValue::Reference(DeclarationId(11))), ("carrier".to_string(), FieldValue::Literal(LiteralBits::String("typing.Union[typing.Tuple[typing.Literal['Ok'], {key}], typing.Tuple[typing.Literal['Err'], {value}]]".to_string()))), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1)))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 17691, 17929) });
         declarations.push(Declaration {
-            id: DeclarationId(1260),
+            id: DeclarationId(1263),
             name: Some("python_non_empty_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(905),
+                template: DeclarationId(908),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(905)),
+            meta_tag: Some(DeclarationId(908)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -37526,22 +37606,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 18020, 18194),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1261),
+            id: DeclarationId(1264),
             name: Some("python_non_singleton_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(905),
+                template: DeclarationId(908),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(905)),
+            meta_tag: Some(DeclarationId(908)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -37561,22 +37641,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 18196, 18382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1262),
+            id: DeclarationId(1265),
             name: Some("python_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(907),
+                template: DeclarationId(910),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(907)),
+            meta_tag: Some(DeclarationId(910)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "target".to_string(),
@@ -37585,17 +37665,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1924),
+                            constructor: DeclarationId(1928),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1481)),
+                        FieldValue::Reference(DeclarationId(1484)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1483)),
+                        FieldValue::Reference(DeclarationId(1486)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -37625,15 +37705,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 18383, 18697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1263),
+            id: DeclarationId(1266),
             name: Some("python_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(824),
+                template: DeclarationId(827),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(824)),
+            meta_tag: Some(DeclarationId(827)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -37661,15 +37741,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 20762, 20904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1264),
+            id: DeclarationId(1267),
             name: Some("python_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(815),
+                template: DeclarationId(818),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(815)),
+            meta_tag: Some(DeclarationId(818)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -37677,55 +37757,55 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1776),
+                            constructor: DeclarationId(1780),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1781),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1789),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1789),
+                            constructor: DeclarationId(1793),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1790),
+                            constructor: DeclarationId(1794),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1795),
+                            constructor: DeclarationId(1799),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1263)),
+                        FieldValue::Reference(DeclarationId(1266)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -37754,7 +37834,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1797),
+                                    constructor: DeclarationId(1801),
                                     payload: vec![],
                                 },
                             ),
@@ -37767,26 +37847,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 20906, 21486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1265),
+            id: DeclarationId(1268),
             name: Some("python_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(816),
+                template: DeclarationId(819),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(816)),
+            meta_tag: Some(DeclarationId(819)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1196)),
+                        FieldValue::Reference(DeclarationId(1199)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1264)),
+                        FieldValue::Reference(DeclarationId(1267)),
                     ),
                 ],
             }),
@@ -37795,15 +37875,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/python.dag", 21488, 21624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1266),
+            id: DeclarationId(1269),
             name: Some("rust_execution_model".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(850),
+                template: DeclarationId(853),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(850)),
+            meta_tag: Some(DeclarationId(853)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -37811,14 +37891,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1842),
+                            constructor: DeclarationId(1846),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1843),
+                            constructor: DeclarationId(1847),
                             payload: vec![],
                         },
                     ),
@@ -37829,22 +37909,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 4448, 4550),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1267),
+            id: DeclarationId(1270),
             name: Some("rust_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(852),
+                template: DeclarationId(855),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(852)),
+            meta_tag: Some(DeclarationId(855)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "internal".to_string(),
-                        FieldValue::Reference(DeclarationId(853)),
+                        FieldValue::Reference(DeclarationId(856)),
                     ),
                     (
                         "additional_excluded_prefixes".to_string(),
@@ -37859,15 +37939,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 4552, 4704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1268),
+            id: DeclarationId(1271),
             name: Some("rust_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(854),
+                template: DeclarationId(857),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(854)),
+            meta_tag: Some(DeclarationId(857)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -37880,22 +37960,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 4706, 4781),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1269),
+            id: DeclarationId(1272),
             name: Some("rust_int".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -37918,22 +37998,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 5232, 5364),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1270),
+            id: DeclarationId(1273),
             name: Some("rust_uint8".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -37956,22 +38036,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 5366, 5501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1271),
+            id: DeclarationId(1274),
             name: Some("rust_i32".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -37994,22 +38074,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 5503, 5637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1272),
+            id: DeclarationId(1275),
             name: Some("rust_u32".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -38032,22 +38112,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 5639, 5774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1273),
+            id: DeclarationId(1276),
             name: Some("rust_i128".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -38070,22 +38150,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 5776, 5913),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1274),
+            id: DeclarationId(1277),
             name: Some("rust_integer_inhabit_u32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(892),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(892)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -38098,15 +38178,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1899),
+                            constructor: DeclarationId(1903),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1575),
+                                constructor: DeclarationId(1578),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(0)),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1574),
+                                        constructor: DeclarationId(1577),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1572),
+                                            constructor: DeclarationId(1575),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 4294967295,
                                             ))],
@@ -38118,7 +38198,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1272)),
+                        FieldValue::Reference(DeclarationId(1275)),
                     ),
                 ],
             }),
@@ -38127,22 +38207,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 6334, 6633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1275),
+            id: DeclarationId(1278),
             name: Some("rust_integer_inhabit_i32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(892),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(892)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -38155,15 +38235,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1899),
+                            constructor: DeclarationId(1903),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1575),
+                                constructor: DeclarationId(1578),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(-2147483648)),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1574),
+                                        constructor: DeclarationId(1577),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1572),
+                                            constructor: DeclarationId(1575),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 4294967295,
                                             ))],
@@ -38175,7 +38255,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1271)),
+                        FieldValue::Reference(DeclarationId(1274)),
                     ),
                 ],
             }),
@@ -38184,22 +38264,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 6635, 6942),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1276),
+            id: DeclarationId(1279),
             name: Some("rust_integer_inhabit_i32_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(892),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(892)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -38212,13 +38292,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1898),
+                            constructor: DeclarationId(1902),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1271)),
+                        FieldValue::Reference(DeclarationId(1274)),
                     ),
                 ],
             }),
@@ -38227,22 +38307,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 6944, 7149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1277),
+            id: DeclarationId(1280),
             name: Some("rust_integer_inhabit_int64_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(892),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(892)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -38255,13 +38335,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1898),
+                            constructor: DeclarationId(1902),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1269)),
+                        FieldValue::Reference(DeclarationId(1272)),
                     ),
                 ],
             }),
@@ -38270,22 +38350,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 7151, 7354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1278),
+            id: DeclarationId(1281),
             name: Some("rust_integer_inhabit_i128_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(892),
+                template: DeclarationId(895),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(892)),
+            meta_tag: Some(DeclarationId(895)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -38298,13 +38378,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1898),
+                            constructor: DeclarationId(1902),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1273)),
+                        FieldValue::Reference(DeclarationId(1276)),
                     ),
                 ],
             }),
@@ -38313,22 +38393,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 7356, 7565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1279),
+            id: DeclarationId(1282),
             name: Some("rust_bool".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -38351,22 +38431,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 7567, 7702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1280),
+            id: DeclarationId(1283),
             name: Some("rust_string".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -38389,22 +38469,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 7704, 7846),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1281),
+            id: DeclarationId(1284),
             name: Some("rust_node_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -38427,22 +38507,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 7848, 7990),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1282),
+            id: DeclarationId(1285),
             name: Some("rust_port_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -38465,22 +38545,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 7992, 8134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1283),
+            id: DeclarationId(1286),
             name: Some("rust_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -38503,22 +38583,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 8136, 8299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1284),
+            id: DeclarationId(1287),
             name: Some("rust_cluster_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -38541,22 +38621,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 8301, 8452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1285),
+            id: DeclarationId(1288),
             name: Some("rust_type_shape".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -38580,7 +38660,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1900),
+                                    constructor: DeclarationId(1904),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -38600,22 +38680,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 8454, 8699),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1286),
+            id: DeclarationId(1289),
             name: Some("rust_port_state".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -38638,22 +38718,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 8701, 8853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1287),
+            id: DeclarationId(1290),
             name: Some("rust_port".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -38678,7 +38758,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1901),
+                                        constructor: DeclarationId(1905),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -38697,7 +38777,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1901),
+                                        constructor: DeclarationId(1905),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state_value".to_string(),
                                         ))],
@@ -38718,7 +38798,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -38739,22 +38819,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 8855, 9251),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1288),
+            id: DeclarationId(1291),
             name: Some("rust_source_span".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -38779,7 +38859,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -38798,7 +38878,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -38817,7 +38897,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -38838,22 +38918,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 9253, 9651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1289),
+            id: DeclarationId(1292),
             name: Some("rust_literal_bits".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -38876,22 +38956,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 9653, 9811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1290),
+            id: DeclarationId(1293),
             name: Some("rust_atom_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -38914,22 +38994,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 9813, 9971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1291),
+            id: DeclarationId(1294),
             name: Some("rust_cardinality_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -38952,22 +39032,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 9973, 10146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1292),
+            id: DeclarationId(1295),
             name: Some("rust_interval".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -38990,22 +39070,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 10148, 10296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1293),
+            id: DeclarationId(1296),
             name: Some("rust_positive_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -39030,22 +39110,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 10298, 10487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1294),
+            id: DeclarationId(1297),
             name: Some("rust_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -39068,22 +39148,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 10489, 10653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1295),
+            id: DeclarationId(1298),
             name: Some("rust_conj_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -39108,7 +39188,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -39127,7 +39207,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -39148,22 +39228,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 10655, 10957),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1296),
+            id: DeclarationId(1299),
             name: Some("rust_template_argument".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -39190,7 +39270,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -39209,7 +39289,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -39230,22 +39310,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 10959, 11300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1297),
+            id: DeclarationId(1300),
             name: Some("rust_phantom_parameter".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -39272,7 +39352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -39291,7 +39371,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -39312,22 +39392,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 11302, 11647),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1298),
+            id: DeclarationId(1301),
             name: Some("rust_nominal_opacity".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -39353,7 +39433,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1900),
+                                    constructor: DeclarationId(1904),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -39373,22 +39453,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 11649, 11925),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1299),
+            id: DeclarationId(1302),
             name: Some("rust_field_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -39415,7 +39495,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "0".to_string(),
                                         ))],
@@ -39434,7 +39514,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "1".to_string(),
                                         ))],
@@ -39455,22 +39535,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 11927, 12244),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1300),
+            id: DeclarationId(1303),
             name: Some("rust_non_empty_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -39495,7 +39575,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -39514,7 +39594,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -39535,22 +39615,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 12246, 12566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1301),
+            id: DeclarationId(1304),
             name: Some("rust_non_singleton_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -39575,7 +39655,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -39594,7 +39674,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -39613,7 +39693,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -39634,22 +39714,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 12568, 12981),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1302),
+            id: DeclarationId(1305),
             name: Some("rust_element_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -39673,7 +39753,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1901),
+                                    constructor: DeclarationId(1905),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "index_of".to_string(),
                                     ))],
@@ -39693,22 +39773,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 12983, 13224),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1303),
+            id: DeclarationId(1306),
             name: Some("rust_param_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -39733,7 +39813,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1901),
+                                        constructor: DeclarationId(1905),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -39752,7 +39832,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1901),
+                                        constructor: DeclarationId(1905),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -39773,22 +39853,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 13226, 13546),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1304),
+            id: DeclarationId(1307),
             name: Some("rust_transform_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -39812,7 +39892,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1901),
+                                    constructor: DeclarationId(1905),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -39832,22 +39912,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 13548, 13793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1305),
+            id: DeclarationId(1308),
             name: Some("rust_member_descent".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -39871,7 +39951,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1900),
+                                    constructor: DeclarationId(1904),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -39891,22 +39971,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 13795, 14040),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1306),
+            id: DeclarationId(1309),
             name: Some("rust_intra_cluster_call".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -39930,7 +40010,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1900),
+                                    constructor: DeclarationId(1904),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -39950,22 +40030,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 14042, 14305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1307),
+            id: DeclarationId(1310),
             name: Some("rust_cluster".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -39990,7 +40070,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -40011,7 +40091,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -40032,22 +40112,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 14307, 14644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1308),
+            id: DeclarationId(1311),
             name: Some("rust_field_value".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -40070,22 +40150,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 14646, 14801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1309),
+            id: DeclarationId(1312),
             name: Some("rust_value_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -40108,22 +40188,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 14803, 14955),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1310),
+            id: DeclarationId(1313),
             name: Some("rust_arrow_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -40146,22 +40226,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 14957, 15109),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1311),
+            id: DeclarationId(1314),
             name: Some("rust_type_connective".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -40184,22 +40264,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 15111, 15278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1312),
+            id: DeclarationId(1315),
             name: Some("rust_declaration".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -40224,7 +40304,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -40243,7 +40323,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -40264,7 +40344,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -40285,7 +40365,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -40306,7 +40386,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -40327,7 +40407,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -40348,7 +40428,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -40369,7 +40449,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -40390,7 +40470,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -40409,7 +40489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -40430,22 +40510,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 15280, 16301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1313),
+            id: DeclarationId(1316),
             name: Some("rust_arithmetic_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -40468,22 +40548,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 16303, 16464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1314),
+            id: DeclarationId(1317),
             name: Some("rust_comparison_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -40506,22 +40586,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 16466, 16627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1315),
+            id: DeclarationId(1318),
             name: Some("rust_logical_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -40544,22 +40624,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 16629, 16781),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1316),
+            id: DeclarationId(1319),
             name: Some("rust_operator_kind".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -40582,22 +40662,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 16783, 16944),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1317),
+            id: DeclarationId(1320),
             name: Some("rust_transform_target".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -40620,22 +40700,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 16946, 17116),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1318),
+            id: DeclarationId(1321),
             name: Some("rust_branch_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -40658,22 +40738,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 17118, 17282),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1319),
+            id: DeclarationId(1322),
             name: Some("rust_payload_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -40700,7 +40780,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -40721,7 +40801,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -40742,22 +40822,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 17284, 17639),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1320),
+            id: DeclarationId(1323),
             name: Some("rust_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -40782,7 +40862,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -40803,7 +40883,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1901),
+                                        constructor: DeclarationId(1905),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -40822,7 +40902,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -40841,7 +40921,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -40862,22 +40942,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 17641, 18129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1321),
+            id: DeclarationId(1324),
             name: Some("rust_loop_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -40900,22 +40980,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 18131, 18283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1322),
+            id: DeclarationId(1325),
             name: Some("rust_value_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -40940,7 +41020,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -40959,7 +41039,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "data".to_string(),
                                         ))],
@@ -40980,7 +41060,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1901),
+                                        constructor: DeclarationId(1905),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -40999,7 +41079,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -41020,7 +41100,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1901),
+                                        constructor: DeclarationId(1905),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -41041,22 +41121,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 18285, 19058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1323),
+            id: DeclarationId(1326),
             name: Some("rust_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -41081,7 +41161,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -41100,7 +41180,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -41119,7 +41199,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -41140,7 +41220,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1901),
+                                        constructor: DeclarationId(1905),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -41159,7 +41239,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -41180,22 +41260,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 19060, 19632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1324),
+            id: DeclarationId(1327),
             name: Some("rust_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -41220,7 +41300,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -41239,7 +41319,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -41258,7 +41338,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -41279,7 +41359,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1901),
+                                        constructor: DeclarationId(1905),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -41298,7 +41378,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -41319,7 +41399,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1901),
+                                        constructor: DeclarationId(1905),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -41340,22 +41420,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 19634, 20301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1325),
+            id: DeclarationId(1328),
             name: Some("rust_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -41380,7 +41460,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -41399,7 +41479,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -41418,7 +41498,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -41437,7 +41517,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -41456,7 +41536,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -41477,7 +41557,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1901),
+                                        constructor: DeclarationId(1905),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -41496,7 +41576,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -41517,22 +41597,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 20303, 21012),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1326),
+            id: DeclarationId(1329),
             name: Some("rust_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -41557,7 +41637,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -41576,7 +41656,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -41597,7 +41677,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1901),
+                                        constructor: DeclarationId(1905),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -41616,7 +41696,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -41635,7 +41715,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1900),
+                                        constructor: DeclarationId(1904),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -41656,7 +41736,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1901),
+                                        constructor: DeclarationId(1905),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -41677,7 +41757,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1901),
+                                        constructor: DeclarationId(1905),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -41698,22 +41778,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 21014, 21774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1327),
+            id: DeclarationId(1330),
             name: Some("rust_behavior".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -41736,22 +41816,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 21776, 21924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1328),
+            id: DeclarationId(1331),
             name: Some("rust_dag".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -41778,7 +41858,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1901),
+                                        constructor: DeclarationId(1905),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -41797,7 +41877,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1901),
+                                        constructor: DeclarationId(1905),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -41816,7 +41896,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1901),
+                                        constructor: DeclarationId(1905),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -41837,7 +41917,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1901),
+                                        constructor: DeclarationId(1905),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -41858,15 +41938,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 21926, 22406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1329),
+            id: DeclarationId(1332),
             name: Some("rust_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -41879,15 +41959,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 22619, 22879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1330),
+            id: DeclarationId(1333),
             name: Some("rust_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -41900,15 +41980,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 22881, 23054),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1331),
+            id: DeclarationId(1334),
             name: Some("rust_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -41921,15 +42001,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 23056, 23473),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1332),
+            id: DeclarationId(1335),
             name: Some("rust_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -41942,15 +42022,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 23475, 23803),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1333),
+            id: DeclarationId(1336),
             name: Some("rust_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -41963,15 +42043,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 23805, 24226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1334),
+            id: DeclarationId(1337),
             name: Some("rust_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -41984,15 +42064,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 24228, 24410),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1335),
+            id: DeclarationId(1338),
             name: Some("rust_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42005,15 +42085,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 24412, 24585),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1336),
+            id: DeclarationId(1339),
             name: Some("rust_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42026,15 +42106,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 24587, 25017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1337),
+            id: DeclarationId(1340),
             name: Some("rust_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42047,15 +42127,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 25019, 25523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1338),
+            id: DeclarationId(1341),
             name: Some("rust_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42068,15 +42148,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 25525, 25950),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1339),
+            id: DeclarationId(1342),
             name: Some("rust_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42089,15 +42169,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 25952, 26389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1340),
+            id: DeclarationId(1343),
             name: Some("rust_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42110,15 +42190,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 26391, 26573),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1341),
+            id: DeclarationId(1344),
             name: Some("rust_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42131,15 +42211,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 26575, 26757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1342),
+            id: DeclarationId(1345),
             name: Some("rust_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42152,22 +42232,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 26759, 26932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1343),
+            id: DeclarationId(1346),
             name: Some("rust_int_add".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -42186,22 +42266,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 27787, 27932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1344),
+            id: DeclarationId(1347),
             name: Some("rust_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -42220,22 +42300,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 27934, 28079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1345),
+            id: DeclarationId(1348),
             name: Some("rust_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -42254,22 +42334,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 28081, 28226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1346),
+            id: DeclarationId(1349),
             name: Some("rust_int_div".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -42290,22 +42370,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 28228, 28386),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1347),
+            id: DeclarationId(1350),
             name: Some("rust_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -42324,22 +42404,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 28836, 28980),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1348),
+            id: DeclarationId(1351),
             name: Some("rust_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -42358,22 +42438,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 28982, 29133),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1349),
+            id: DeclarationId(1352),
             name: Some("rust_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -42392,22 +42472,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 29135, 29286),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1350),
+            id: DeclarationId(1353),
             name: Some("rust_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -42426,22 +42506,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 29288, 29453),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1351),
+            id: DeclarationId(1354),
             name: Some("rust_string_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -42460,22 +42540,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 29646, 29796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1352),
+            id: DeclarationId(1355),
             name: Some("rust_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -42494,22 +42574,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 29798, 29942),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1353),
+            id: DeclarationId(1356),
             name: Some("rust_node_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -42528,22 +42608,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 29944, 30095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1354),
+            id: DeclarationId(1357),
             name: Some("rust_port_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -42562,22 +42642,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 30097, 30248),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1355),
+            id: DeclarationId(1358),
             name: Some("rust_declaration_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -42596,22 +42676,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 30250, 30415),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1356),
+            id: DeclarationId(1359),
             name: Some("rust_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -42630,22 +42710,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 30417, 30560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1357),
+            id: DeclarationId(1360),
             name: Some("rust_int_le".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -42664,22 +42744,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 30562, 30706),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1358),
+            id: DeclarationId(1361),
             name: Some("rust_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -42698,22 +42778,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 30708, 30851),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1359),
+            id: DeclarationId(1362),
             name: Some("rust_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -42732,22 +42812,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 30853, 30997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1360),
+            id: DeclarationId(1363),
             name: Some("rust_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -42766,22 +42846,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 30999, 31152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1361),
+            id: DeclarationId(1364),
             name: Some("rust_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(896),
+                template: DeclarationId(899),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(896)),
+            meta_tag: Some(DeclarationId(899)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -42800,26 +42880,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 31154, 31307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1362),
+            id: DeclarationId(1365),
             name: Some("rust_let_stmt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(897),
+                template: DeclarationId(900),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(897)),
+            meta_tag: Some(DeclarationId(900)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1061)),
+                        FieldValue::Reference(DeclarationId(1064)),
                     ),
                     (
                         "carrier".to_string(),
@@ -42835,26 +42915,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 32057, 32196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1363),
+            id: DeclarationId(1366),
             name: Some("rust_if_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(897),
+                template: DeclarationId(900),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(897)),
+            meta_tag: Some(DeclarationId(900)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1059)),
+                        FieldValue::Reference(DeclarationId(1062)),
                     ),
                     (
                         "carrier".to_string(),
@@ -42870,26 +42950,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 32198, 32345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1364),
+            id: DeclarationId(1367),
             name: Some("rust_main_wrap".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(897),
+                template: DeclarationId(900),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(897)),
+            meta_tag: Some(DeclarationId(900)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1062)),
+                        FieldValue::Reference(DeclarationId(1065)),
                     ),
                     (
                         "carrier".to_string(),
@@ -42906,22 +42986,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 32347, 32517),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1365),
+            id: DeclarationId(1368),
             name: Some("rust_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -42930,7 +43010,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1913),
+                            constructor: DeclarationId(1917),
                             payload: vec![],
                         },
                     ),
@@ -42943,22 +43023,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 33894, 34036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1366),
+            id: DeclarationId(1369),
             name: Some("rust_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -42967,7 +43047,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1914),
+                            constructor: DeclarationId(1918),
                             payload: vec![],
                         },
                     ),
@@ -42978,7 +43058,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1904),
+                                    constructor: DeclarationId(1908),
                                     payload: vec![],
                                 },
                             ),
@@ -42992,22 +43072,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 34038, 34234),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1367),
+            id: DeclarationId(1370),
             name: Some("rust_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -43016,7 +43096,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1915),
+                            constructor: DeclarationId(1919),
                             payload: vec![],
                         },
                     ),
@@ -43028,7 +43108,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1904),
+                                        constructor: DeclarationId(1908),
                                         payload: vec![],
                                     },
                                 ),
@@ -43038,7 +43118,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1904),
+                                        constructor: DeclarationId(1908),
                                         payload: vec![],
                                     },
                                 ),
@@ -43053,22 +43133,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 34236, 34457),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1368),
+            id: DeclarationId(1371),
             name: Some("rust_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -43077,7 +43157,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1916),
+                            constructor: DeclarationId(1920),
                             payload: vec![],
                         },
                     ),
@@ -43089,7 +43169,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1904),
+                                        constructor: DeclarationId(1908),
                                         payload: vec![],
                                     },
                                 ),
@@ -43099,7 +43179,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1904),
+                                        constructor: DeclarationId(1908),
                                         payload: vec![],
                                     },
                                 ),
@@ -43114,22 +43194,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 34459, 34686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1369),
+            id: DeclarationId(1372),
             name: Some("rust_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -43138,7 +43218,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1917),
+                            constructor: DeclarationId(1921),
                             payload: vec![],
                         },
                     ),
@@ -43149,7 +43229,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1903),
+                                    constructor: DeclarationId(1907),
                                     payload: vec![],
                                 },
                             ),
@@ -43163,22 +43243,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 34688, 34875),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1370),
+            id: DeclarationId(1373),
             name: Some("rust_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(905),
+                template: DeclarationId(908),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(905)),
+            meta_tag: Some(DeclarationId(908)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -43196,22 +43276,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 34877, 35020),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1371),
+            id: DeclarationId(1374),
             name: Some("rust_result_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(905),
+                template: DeclarationId(908),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(905)),
+            meta_tag: Some(DeclarationId(908)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -43231,26 +43311,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 35299, 35470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1372),
+            id: DeclarationId(1375),
             name: Some("rust_lookup_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(905),
+                template: DeclarationId(908),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(905)),
+            meta_tag: Some(DeclarationId(908)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(990)),
+                        FieldValue::Reference(DeclarationId(993)),
                     ),
                     (
                         "carrier".to_string(),
@@ -43264,22 +43344,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 35472, 35622),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1373),
+            id: DeclarationId(1376),
             name: Some("rust_map_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(905),
+                template: DeclarationId(908),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(905)),
+            meta_tag: Some(DeclarationId(908)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -43299,22 +43379,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 35624, 35774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1374),
+            id: DeclarationId(1377),
             name: Some("rust_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -43323,7 +43403,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1918),
+                            constructor: DeclarationId(1922),
                             payload: vec![],
                         },
                     ),
@@ -43334,7 +43414,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1903),
+                                    constructor: DeclarationId(1907),
                                     payload: vec![],
                                 },
                             ),
@@ -43348,22 +43428,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 35776, 35968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1375),
+            id: DeclarationId(1378),
             name: Some("rust_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -43372,7 +43452,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1919),
+                            constructor: DeclarationId(1923),
                             payload: vec![],
                         },
                     ),
@@ -43384,7 +43464,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -43394,7 +43474,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1904),
+                                        constructor: DeclarationId(1908),
                                         payload: vec![],
                                     },
                                 ),
@@ -43404,7 +43484,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -43419,22 +43499,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 35970, 36231),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1376),
+            id: DeclarationId(1379),
             name: Some("rust_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -43443,7 +43523,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1920),
+                            constructor: DeclarationId(1924),
                             payload: vec![],
                         },
                     ),
@@ -43455,7 +43535,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -43465,7 +43545,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -43480,22 +43560,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 36233, 36451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1377),
+            id: DeclarationId(1380),
             name: Some("rust_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -43504,7 +43584,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1921),
+                            constructor: DeclarationId(1925),
                             payload: vec![],
                         },
                     ),
@@ -43516,7 +43596,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -43526,7 +43606,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -43541,22 +43621,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 36453, 36680),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1378),
+            id: DeclarationId(1381),
             name: Some("rust_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(898),
+                template: DeclarationId(901),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(898)),
+            meta_tag: Some(DeclarationId(901)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -43565,7 +43645,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1922),
+                            constructor: DeclarationId(1926),
                             payload: vec![],
                         },
                     ),
@@ -43577,7 +43657,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -43587,7 +43667,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1903),
+                                        constructor: DeclarationId(1907),
                                         payload: vec![],
                                     },
                                 ),
@@ -43602,22 +43682,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 36682, 36915),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1379),
+            id: DeclarationId(1382),
             name: Some("rust_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(907),
+                template: DeclarationId(910),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(907)),
+            meta_tag: Some(DeclarationId(910)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -43626,17 +43706,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1924),
+                            constructor: DeclarationId(1928),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1481)),
+                        FieldValue::Reference(DeclarationId(1484)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1483)),
+                        FieldValue::Reference(DeclarationId(1486)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -43668,15 +43748,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 37143, 37447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1380),
+            id: DeclarationId(1383),
             name: Some("rust_statements".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(912),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(912)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43700,15 +43780,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 37449, 37587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1381),
+            id: DeclarationId(1384),
             name: Some("rust_expressions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(910),
+                template: DeclarationId(913),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(910)),
+            meta_tag: Some(DeclarationId(913)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43734,15 +43814,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 37589, 37742),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1382),
+            id: DeclarationId(1385),
             name: Some("rust_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(912),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(912)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43779,15 +43859,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 37744, 37934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1383),
+            id: DeclarationId(1386),
             name: Some("rust_literals".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43811,15 +43891,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 37936, 38048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1384),
+            id: DeclarationId(1387),
             name: Some("rust_modules".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(914),
+                template: DeclarationId(917),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(914)),
+            meta_tag: Some(DeclarationId(917)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43833,15 +43913,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 38050, 38110),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1385),
+            id: DeclarationId(1388),
             name: Some("rust_functions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(918),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(918)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43879,15 +43959,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 38112, 38390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1386),
+            id: DeclarationId(1389),
             name: Some("rust_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(916),
+                template: DeclarationId(919),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(916)),
+            meta_tag: Some(DeclarationId(919)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43901,15 +43981,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 38392, 38480),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1387),
+            id: DeclarationId(1390),
             name: Some("rust_type_defs".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(917),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(917)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43947,15 +44027,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 38482, 38784),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1388),
+            id: DeclarationId(1391),
             name: Some("rust_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(918),
+                template: DeclarationId(921),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(918)),
+            meta_tag: Some(DeclarationId(921)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43979,15 +44059,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 38786, 38999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1389),
+            id: DeclarationId(1392),
             name: Some("rust_patterns".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(919),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(919)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44036,17 +44116,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/spec/rust.dag", 39001, 39336),
         });
-        declarations.push(Declaration { id: DeclarationId(1390), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(920), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(920)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __left = {left}; __left.extend({right}); __left }".to_string()))), ("length".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).len() as i64".to_string()))), ("is_empty".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).is_empty()".to_string()))), ("fold".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().fold({init}, {body})".to_string()))), ("map".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().map({body}).collect::<Vec<_>>()".to_string()))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 39338, 39929) });
+        declarations.push(Declaration { id: DeclarationId(1393), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(923), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(923)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __left = {left}; __left.extend({right}); __left }".to_string()))), ("length".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).len() as i64".to_string()))), ("is_empty".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).is_empty()".to_string()))), ("fold".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().fold({init}, {body})".to_string()))), ("map".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().map({body}).collect::<Vec<_>>()".to_string()))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 39338, 39929) });
         declarations.push(Declaration {
-            id: DeclarationId(1391),
+            id: DeclarationId(1394),
             name: Some("rust_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(921),
+                template: DeclarationId(924),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(921)),
+            meta_tag: Some(DeclarationId(924)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44082,15 +44162,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 39931, 40203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1392),
+            id: DeclarationId(1395),
             name: Some("rust_rendering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(922),
+                template: DeclarationId(925),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(922)),
+            meta_tag: Some(DeclarationId(925)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44098,14 +44178,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "read".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1925),
+                            constructor: DeclarationId(1929),
                             payload: vec![],
                         },
                     ),
                     (
                         "construct".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1927),
+                            constructor: DeclarationId(1931),
                             payload: vec![],
                         },
                     ),
@@ -44116,66 +44196,66 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 40205, 40286),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1393),
+            id: DeclarationId(1396),
             name: Some("rust_language".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(925),
+                template: DeclarationId(928),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(925)),
+            meta_tag: Some(DeclarationId(928)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1380)),
+                        FieldValue::Reference(DeclarationId(1383)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1381)),
+                        FieldValue::Reference(DeclarationId(1384)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1382)),
+                        FieldValue::Reference(DeclarationId(1385)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1383)),
+                        FieldValue::Reference(DeclarationId(1386)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1384)),
+                        FieldValue::Reference(DeclarationId(1387)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1385)),
+                        FieldValue::Reference(DeclarationId(1388)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1386)),
+                        FieldValue::Reference(DeclarationId(1389)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1387)),
+                        FieldValue::Reference(DeclarationId(1390)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1388)),
+                        FieldValue::Reference(DeclarationId(1391)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1389)),
+                        FieldValue::Reference(DeclarationId(1392)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1390)),
+                        FieldValue::Reference(DeclarationId(1393)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1391)),
+                        FieldValue::Reference(DeclarationId(1394)),
                     ),
                 ],
             }),
@@ -44184,15 +44264,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 40288, 40733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1394),
+            id: DeclarationId(1397),
             name: Some("rust_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(824),
+                template: DeclarationId(827),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(824)),
+            meta_tag: Some(DeclarationId(827)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44220,15 +44300,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 42157, 42296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1395),
+            id: DeclarationId(1398),
             name: Some("rust_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(815),
+                template: DeclarationId(818),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(815)),
+            meta_tag: Some(DeclarationId(818)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44236,55 +44316,55 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1776),
+                            constructor: DeclarationId(1780),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1779),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1789),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1788),
+                            constructor: DeclarationId(1792),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1791),
+                            constructor: DeclarationId(1795),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1794),
+                            constructor: DeclarationId(1798),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1394)),
+                        FieldValue::Reference(DeclarationId(1397)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -44316,7 +44396,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1797),
+                                    constructor: DeclarationId(1801),
                                     payload: vec![],
                                 },
                             ),
@@ -44329,26 +44409,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 42298, 42911),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1396),
+            id: DeclarationId(1399),
             name: Some("rust_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(816),
+                template: DeclarationId(819),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(816)),
+            meta_tag: Some(DeclarationId(819)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1395)),
+                        FieldValue::Reference(DeclarationId(1398)),
                     ),
                 ],
             }),
@@ -44357,7 +44437,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 42913, 43043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1397),
+            id: DeclarationId(1400),
             name: Some("rust_port_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(745),
@@ -44381,7 +44461,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 44145, 44248),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1398),
+            id: DeclarationId(1401),
             name: Some("rust_node_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(745),
@@ -44405,7 +44485,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 44250, 44353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1399),
+            id: DeclarationId(1402),
             name: Some("rust_resolve_producer_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(745),
@@ -44429,7 +44509,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 44355, 44482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1400),
+            id: DeclarationId(1403),
             name: Some("port_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(746),
@@ -44448,11 +44528,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1397)),
+                        FieldValue::Reference(DeclarationId(1400)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                 ],
             }),
@@ -44461,7 +44541,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 44484, 44615),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1401),
+            id: DeclarationId(1404),
             name: Some("node_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(746),
@@ -44480,11 +44560,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1398)),
+                        FieldValue::Reference(DeclarationId(1401)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                 ],
             }),
@@ -44493,7 +44573,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 44617, 44748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1402),
+            id: DeclarationId(1405),
             name: Some("resolve_producer_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(746),
@@ -44512,11 +44592,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1399)),
+                        FieldValue::Reference(DeclarationId(1402)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                 ],
             }),
@@ -44525,7 +44605,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 44750, 44917),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1403),
+            id: DeclarationId(1406),
             name: Some("rust_lane2_workflow_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(745),
@@ -44549,7 +44629,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 45428, 45557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1404),
+            id: DeclarationId(1407),
             name: Some("lane2_workflow_at_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(746),
@@ -44568,11 +44648,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1403)),
+                        FieldValue::Reference(DeclarationId(1406)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                 ],
             }),
@@ -44581,7 +44661,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 45559, 45726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1405),
+            id: DeclarationId(1408),
             name: Some("rust_workflow_root_port_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(745),
@@ -44605,7 +44685,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 46421, 46535),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1406),
+            id: DeclarationId(1409),
             name: Some("workflow_root_port_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(746),
@@ -44624,11 +44704,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1405)),
+                        FieldValue::Reference(DeclarationId(1408)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                 ],
             }),
@@ -44637,22 +44717,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 46537, 46710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1407),
+            id: DeclarationId(1410),
             name: Some("rust_workflow_root".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(891),
+                template: DeclarationId(894),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(891)),
+            meta_tag: Some(DeclarationId(894)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                     (
                         "target".to_string(),
@@ -44675,7 +44755,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 47122, 47283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1408),
+            id: DeclarationId(1411),
             name: Some("rust_declaration_by_id_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(745),
@@ -44699,7 +44779,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 47610, 47733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1409),
+            id: DeclarationId(1412),
             name: Some("declaration_by_id_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(746),
@@ -44718,11 +44798,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1408)),
+                        FieldValue::Reference(DeclarationId(1411)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1393)),
+                        FieldValue::Reference(DeclarationId(1396)),
                     ),
                 ],
             }),
@@ -44731,7 +44811,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 47735, 47905),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1410),
+            id: DeclarationId(1413),
             name: Some("CompilerHostRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -44750,21 +44830,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 453, 502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1411),
+            id: DeclarationId(1414),
             name: Some("PipelineSnapshotKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SnapshotSurface".to_string(),
-                        ty: DeclarationId(2157),
+                        ty: DeclarationId(2161),
                     },
                     Field {
                         label: "SnapshotDag".to_string(),
-                        ty: DeclarationId(2158),
+                        ty: DeclarationId(2162),
                     },
                     Field {
                         label: "SnapshotText".to_string(),
-                        ty: DeclarationId(2159),
+                        ty: DeclarationId(2163),
                     },
                 ],
             },
@@ -44779,21 +44859,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 504, 576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1412),
+            id: DeclarationId(1415),
             name: Some("PipelineStageBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "stage".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "realization".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "snapshot".to_string(),
-                        ty: DeclarationId(1411),
+                        ty: DeclarationId(1414),
                     },
                 ],
             },
@@ -44808,7 +44888,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 578, 694),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1413),
+            id: DeclarationId(1416),
             name: Some("parse_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -44818,7 +44898,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1410)),
+            meta_tag: Some(DeclarationId(1413)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44832,7 +44912,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 696, 780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1414),
+            id: DeclarationId(1417),
             name: Some("lower_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -44842,7 +44922,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1410)),
+            meta_tag: Some(DeclarationId(1413)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44856,7 +44936,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 782, 866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1415),
+            id: DeclarationId(1418),
             name: Some("infer_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -44866,7 +44946,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1410)),
+            meta_tag: Some(DeclarationId(1413)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44880,7 +44960,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 868, 952),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1416),
+            id: DeclarationId(1419),
             name: Some("compute_ownership_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -44890,7 +44970,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1410)),
+            meta_tag: Some(DeclarationId(1413)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44906,7 +44986,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 954, 1062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1417),
+            id: DeclarationId(1420),
             name: Some("emit_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -44916,7 +44996,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1410)),
+            meta_tag: Some(DeclarationId(1413)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44930,7 +45010,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1064, 1146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1418),
+            id: DeclarationId(1421),
             name: Some("lens_complexity_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -44940,7 +45020,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1410)),
+            meta_tag: Some(DeclarationId(1413)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -44956,31 +45036,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1148, 1252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1419),
+            id: DeclarationId(1422),
             name: Some("parse_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1412),
+                template: DeclarationId(1415),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1412)),
+            meta_tag: Some(DeclarationId(1415)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1425)),
+                        FieldValue::Reference(DeclarationId(1428)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1413)),
+                        FieldValue::Reference(DeclarationId(1416)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2157),
+                            constructor: DeclarationId(2161),
                             payload: vec![],
                         },
                     ),
@@ -44991,31 +45071,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1254, 1382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1420),
+            id: DeclarationId(1423),
             name: Some("lower_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1412),
+                template: DeclarationId(1415),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1412)),
+            meta_tag: Some(DeclarationId(1415)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1426)),
+                        FieldValue::Reference(DeclarationId(1429)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1414)),
+                        FieldValue::Reference(DeclarationId(1417)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2158),
+                            constructor: DeclarationId(2162),
                             payload: vec![],
                         },
                     ),
@@ -45026,31 +45106,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1384, 1508),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1421),
+            id: DeclarationId(1424),
             name: Some("infer_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1412),
+                template: DeclarationId(1415),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1412)),
+            meta_tag: Some(DeclarationId(1415)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1427)),
+                        FieldValue::Reference(DeclarationId(1430)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1415)),
+                        FieldValue::Reference(DeclarationId(1418)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2158),
+                            constructor: DeclarationId(2162),
                             payload: vec![],
                         },
                     ),
@@ -45061,31 +45141,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1510, 1634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1422),
+            id: DeclarationId(1425),
             name: Some("compute_ownership_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1412),
+                template: DeclarationId(1415),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1412)),
+            meta_tag: Some(DeclarationId(1415)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1428)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1416)),
+                        FieldValue::Reference(DeclarationId(1419)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2158),
+                            constructor: DeclarationId(2162),
                             payload: vec![],
                         },
                     ),
@@ -45096,31 +45176,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1636, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1423),
+            id: DeclarationId(1426),
             name: Some("lens_complexity_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1412),
+                template: DeclarationId(1415),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1412)),
+            meta_tag: Some(DeclarationId(1415)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1432)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1418)),
+                        FieldValue::Reference(DeclarationId(1421)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2158),
+                            constructor: DeclarationId(2162),
                             payload: vec![],
                         },
                     ),
@@ -45131,31 +45211,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1798, 1952),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1424),
+            id: DeclarationId(1427),
             name: Some("emit_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1412),
+                template: DeclarationId(1415),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1412)),
+            meta_tag: Some(DeclarationId(1415)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1430)),
+                        FieldValue::Reference(DeclarationId(1433)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1417)),
+                        FieldValue::Reference(DeclarationId(1420)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2159),
+                            constructor: DeclarationId(2163),
                             payload: vec![],
                         },
                     ),
@@ -45166,12 +45246,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1954, 2076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1425),
+            id: DeclarationId(1428),
             name: Some("parse".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197), DeclarationId(197)],
                 output: DeclarationId(744),
-                body: ArrowBody::ExternalRealization(DeclarationId(1413)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1416)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -45184,12 +45264,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2078, 2140),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1426),
+            id: DeclarationId(1429),
             name: Some("lower".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744)],
                 output: DeclarationId(744),
-                body: ArrowBody::ExternalRealization(DeclarationId(1414)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1417)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -45202,12 +45282,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2142, 2184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1427),
+            id: DeclarationId(1430),
             name: Some("infer".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744)],
                 output: DeclarationId(744),
-                body: ArrowBody::ExternalRealization(DeclarationId(1415)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1418)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -45220,12 +45300,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2186, 2228),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1428),
+            id: DeclarationId(1431),
             name: Some("compute_ownership".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744)],
                 output: DeclarationId(744),
-                body: ArrowBody::ExternalRealization(DeclarationId(1416)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1419)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -45238,12 +45318,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2230, 2288),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1429),
+            id: DeclarationId(1432),
             name: Some("lens_complexity".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744)],
                 output: DeclarationId(744),
-                body: ArrowBody::ExternalRealization(DeclarationId(1418)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1421)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -45256,17 +45336,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2290, 2347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1430),
+            id: DeclarationId(1433),
             name: Some("emit".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
                     DeclarationId(744),
                     DeclarationId(744),
                     DeclarationId(744),
-                    DeclarationId(925),
+                    DeclarationId(928),
                 ],
                 output: DeclarationId(197),
-                body: ArrowBody::ExternalRealization(DeclarationId(1417)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1420)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -45279,10 +45359,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2349, 2460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1431),
+            id: DeclarationId(1434),
             name: Some("compile".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(197), DeclarationId(197), DeclarationId(925)],
+                inputs: vec![DeclarationId(197), DeclarationId(197), DeclarationId(928)],
                 output: DeclarationId(197),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/pipeline.dag",
@@ -45301,11 +45381,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2462, 2605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1432),
+            id: DeclarationId(1435),
             name: Some("from_symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(2160),
+                output: DeclarationId(2164),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/operators.dag",
                     156,
@@ -45323,7 +45403,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/operators.dag", 108, 771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1433),
+            id: DeclarationId(1436),
             name: Some("symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(722)],
@@ -45341,7 +45421,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/operators.dag", 773, 1214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1434),
+            id: DeclarationId(1437),
             name: Some("algebra_field_name".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(722)],
@@ -45359,7 +45439,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1216, 2017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1435),
+            id: DeclarationId(1438),
             name: Some("LensRegistryEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -45388,15 +45468,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 1950, 2045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1436),
+            id: DeclarationId(1439),
             name: Some("lens_cost_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1435),
+                template: DeclarationId(1438),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1435)),
+            meta_tag: Some(DeclarationId(1438)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45424,15 +45504,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2047, 2214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1437),
+            id: DeclarationId(1440),
             name: Some("lens_cost_symbolic_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1435),
+                template: DeclarationId(1438),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1435)),
+            meta_tag: Some(DeclarationId(1438)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45460,15 +45540,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2216, 2404),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1438),
+            id: DeclarationId(1441),
             name: Some("lens_effect_enumeration_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1435),
+                template: DeclarationId(1438),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1435)),
+            meta_tag: Some(DeclarationId(1438)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45496,15 +45576,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2406, 2623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1439),
+            id: DeclarationId(1442),
             name: Some("lens_provenance_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1435),
+                template: DeclarationId(1438),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1435)),
+            meta_tag: Some(DeclarationId(1438)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45532,15 +45612,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2625, 2810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1440),
+            id: DeclarationId(1443),
             name: Some("lens_structural_resolution_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1435),
+                template: DeclarationId(1438),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1435)),
+            meta_tag: Some(DeclarationId(1438)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45571,15 +45651,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2812, 3041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1441),
+            id: DeclarationId(1444),
             name: Some("lens_unused_parameters_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1435),
+                template: DeclarationId(1438),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1435)),
+            meta_tag: Some(DeclarationId(1438)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45607,15 +45687,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3043, 3256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1442),
+            id: DeclarationId(1445),
             name: Some("lens_infer_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1435),
+                template: DeclarationId(1438),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1435)),
+            meta_tag: Some(DeclarationId(1438)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45643,15 +45723,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3883, 4075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1443),
+            id: DeclarationId(1446),
             name: Some("lens_variant_payload_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1435),
+                template: DeclarationId(1438),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1435)),
+            meta_tag: Some(DeclarationId(1438)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45679,15 +45759,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 4077, 4277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1444),
+            id: DeclarationId(1447),
             name: Some("lens_lower_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1435),
+                template: DeclarationId(1438),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1435)),
+            meta_tag: Some(DeclarationId(1438)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45715,17 +45795,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 4527, 4719),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1445),
+            id: DeclarationId(1448),
             name: Some("IntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OrderedRingAlgebra".to_string(),
-                        ty: DeclarationId(2161),
+                        ty: DeclarationId(2165),
                     },
                     Field {
                         label: "SemiringAlgebra".to_string(),
-                        ty: DeclarationId(2162),
+                        ty: DeclarationId(2166),
                     },
                 ],
             },
@@ -45740,17 +45820,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5528, 5590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1446),
+            id: DeclarationId(1449),
             name: Some("NonIntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BooleanAlgebraAlgebra".to_string(),
-                        ty: DeclarationId(2163),
+                        ty: DeclarationId(2167),
                     },
                     Field {
                         label: "TerminalAlgebra".to_string(),
-                        ty: DeclarationId(2164),
+                        ty: DeclarationId(2168),
                     },
                 ],
             },
@@ -45765,37 +45845,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5592, 5660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1447),
+            id: DeclarationId(1450),
             name: Some("TargetCarrier".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BitCarrier".to_string(),
-                        ty: DeclarationId(2165),
+                        ty: DeclarationId(2169),
                     },
                     Field {
                         label: "ByteCarrier".to_string(),
-                        ty: DeclarationId(2166),
+                        ty: DeclarationId(2170),
                     },
                     Field {
                         label: "Word16Carrier".to_string(),
-                        ty: DeclarationId(2167),
+                        ty: DeclarationId(2171),
                     },
                     Field {
                         label: "Word32Carrier".to_string(),
-                        ty: DeclarationId(2168),
+                        ty: DeclarationId(2172),
                     },
                     Field {
                         label: "Word64Carrier".to_string(),
-                        ty: DeclarationId(2169),
+                        ty: DeclarationId(2173),
                     },
                     Field {
                         label: "Word128Carrier".to_string(),
-                        ty: DeclarationId(2170),
+                        ty: DeclarationId(2174),
                     },
                     Field {
                         label: "TerminalCarrier".to_string(),
-                        ty: DeclarationId(2171),
+                        ty: DeclarationId(2175),
                     },
                 ],
             },
@@ -45810,21 +45890,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7234, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1448),
+            id: DeclarationId(1451),
             name: Some("IntegerOverflow".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TwoComplementWrap".to_string(),
-                        ty: DeclarationId(2172),
+                        ty: DeclarationId(2176),
                     },
                     Field {
                         label: "Saturating".to_string(),
-                        ty: DeclarationId(2173),
+                        ty: DeclarationId(2177),
                     },
                     Field {
                         label: "Trap".to_string(),
-                        ty: DeclarationId(2174),
+                        ty: DeclarationId(2178),
                     },
                 ],
             },
@@ -45839,17 +45919,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8093, 8159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1449),
+            id: DeclarationId(1452),
             name: Some("RustPrimitive".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerPrimitive".to_string(),
-                        ty: DeclarationId(2175),
+                        ty: DeclarationId(2179),
                     },
                     Field {
                         label: "NonIntegerPrimitive".to_string(),
-                        ty: DeclarationId(2176),
+                        ty: DeclarationId(2180),
                     },
                 ],
             },
@@ -45864,94 +45944,94 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8914, 9696),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1450),
+            id: DeclarationId(1453),
             name: Some("rust_pilot_primitives".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1449),
+                    value: DeclarationId(1452),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2177)),
+            meta_tag: Some(DeclarationId(2181)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
                 FieldValue::Variant {
-                    constructor: DeclarationId(2175),
+                    constructor: DeclarationId(2179),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2161),
+                            constructor: DeclarationId(2165),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2170),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("-128".to_string())),
                         FieldValue::Literal(LiteralBits::String("127".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2172),
+                            constructor: DeclarationId(2176),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2175),
+                    constructor: DeclarationId(2179),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2161),
+                            constructor: DeclarationId(2165),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("-32768".to_string())),
                         FieldValue::Literal(LiteralBits::String("32767".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2172),
+                            constructor: DeclarationId(2176),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2175),
+                    constructor: DeclarationId(2179),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2161),
+                            constructor: DeclarationId(2165),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2168),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("-2147483648".to_string())),
                         FieldValue::Literal(LiteralBits::String("2147483647".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2172),
+                            constructor: DeclarationId(2176),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2175),
+                    constructor: DeclarationId(2179),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2161),
+                            constructor: DeclarationId(2165),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2169),
+                            constructor: DeclarationId(2173),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -45960,21 +46040,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2172),
+                            constructor: DeclarationId(2176),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2175),
+                    constructor: DeclarationId(2179),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2161),
+                            constructor: DeclarationId(2165),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2174),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -45985,84 +46065,84 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2172),
+                            constructor: DeclarationId(2176),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2175),
+                    constructor: DeclarationId(2179),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2162),
+                            constructor: DeclarationId(2166),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2170),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("255".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2172),
+                            constructor: DeclarationId(2176),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2175),
+                    constructor: DeclarationId(2179),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2162),
+                            constructor: DeclarationId(2166),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("65535".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2172),
+                            constructor: DeclarationId(2176),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2175),
+                    constructor: DeclarationId(2179),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2162),
+                            constructor: DeclarationId(2166),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2168),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("4294967295".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2172),
+                            constructor: DeclarationId(2176),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2175),
+                    constructor: DeclarationId(2179),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2162),
+                            constructor: DeclarationId(2166),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2169),
+                            constructor: DeclarationId(2173),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -46071,36 +46151,36 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2172),
+                            constructor: DeclarationId(2176),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2176),
+                    constructor: DeclarationId(2180),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("bool".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2163),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2165),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2176),
+                    constructor: DeclarationId(2180),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("()".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2164),
+                            constructor: DeclarationId(2168),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2175),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -46112,7 +46192,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9996, 13318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1451),
+            id: DeclarationId(1454),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46132,7 +46212,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 3259, 3272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1452),
+            id: DeclarationId(1455),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46152,7 +46232,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 3421, 3434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1453),
+            id: DeclarationId(1456),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46172,7 +46252,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 3439, 3452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1454),
+            id: DeclarationId(1457),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46192,7 +46272,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 3556, 3569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1455),
+            id: DeclarationId(1458),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46212,7 +46292,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4162, 4169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1456),
+            id: DeclarationId(1459),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(614), DeclarationId(613)],
@@ -46230,7 +46310,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1457),
+            id: DeclarationId(1460),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46250,7 +46330,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4617, 4624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1458),
+            id: DeclarationId(1461),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(616), DeclarationId(617)],
@@ -46268,7 +46348,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4638, 4651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1459),
+            id: DeclarationId(1462),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46288,7 +46368,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5336, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1460),
+            id: DeclarationId(1463),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46308,7 +46388,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5354, 5367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1461),
+            id: DeclarationId(1464),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46328,7 +46408,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5372, 5385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1462),
+            id: DeclarationId(1465),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46348,7 +46428,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5686, 5693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1463),
+            id: DeclarationId(1466),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(621)],
@@ -46366,7 +46446,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5698, 5708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1464),
+            id: DeclarationId(1467),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46386,7 +46466,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5713, 5720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1465),
+            id: DeclarationId(1468),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46406,7 +46486,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5867, 5874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1466),
+            id: DeclarationId(1469),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(624)],
@@ -46424,7 +46504,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1467),
+            id: DeclarationId(1470),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46444,7 +46524,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5897, 5904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1468),
+            id: DeclarationId(1471),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46464,7 +46544,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6130, 6137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1469),
+            id: DeclarationId(1472),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46484,11 +46564,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6151, 6158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1470),
+            id: DeclarationId(1473),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(626)],
-                output: DeclarationId(1469),
+                output: DeclarationId(1472),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -46502,7 +46582,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6142, 6158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1471),
+            id: DeclarationId(1474),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46522,7 +46602,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6163, 6170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1472),
+            id: DeclarationId(1475),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46542,7 +46622,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6356, 6363),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1473),
+            id: DeclarationId(1476),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46562,7 +46642,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6588, 6595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1474),
+            id: DeclarationId(1477),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46582,7 +46662,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 7202, 7209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1475),
+            id: DeclarationId(1478),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(632),
@@ -46602,13 +46682,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 7219, 7236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1476),
+            id: DeclarationId(1479),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1475),
+                    value: DeclarationId(1478),
                 }],
             },
             type_params: vec![],
@@ -46622,7 +46702,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 7214, 7237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1477),
+            id: DeclarationId(1480),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46642,7 +46722,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 7415, 7422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1478),
+            id: DeclarationId(1481),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(632),
@@ -46662,13 +46742,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 7444, 7461),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1479),
+            id: DeclarationId(1482),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1478),
+                    value: DeclarationId(1481),
                 }],
             },
             type_params: vec![],
@@ -46682,7 +46762,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 7439, 7462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1480),
+            id: DeclarationId(1483),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46702,7 +46782,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 8177, 8184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1481),
+            id: DeclarationId(1484),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -46716,7 +46796,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 2106, 2111),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1482),
+            id: DeclarationId(1485),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46736,7 +46816,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 2144, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1483),
+            id: DeclarationId(1486),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -46746,7 +46826,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "tail".to_string(),
-                        ty: DeclarationId(1482),
+                        ty: DeclarationId(1485),
                     },
                 ],
             },
@@ -46761,7 +46841,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 2116, 2159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1484),
+            id: DeclarationId(1487),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46781,7 +46861,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1477, 1490),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1485),
+            id: DeclarationId(1488),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46801,7 +46881,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1570, 1583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1486),
+            id: DeclarationId(1489),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(197),
@@ -46818,7 +46898,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1487),
+            id: DeclarationId(1490),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(729),
@@ -46838,7 +46918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20916, 20943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1488),
+            id: DeclarationId(1491),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(632),
@@ -46858,7 +46938,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20995, 21026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1489),
+            id: DeclarationId(1492),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(729),
@@ -46878,10 +46958,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1490),
+            id: DeclarationId(1493),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(1489),
+                DeclarationId(1492),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -46895,7 +46975,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1491),
+            id: DeclarationId(1494),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46915,7 +46995,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21185, 21206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1492),
+            id: DeclarationId(1495),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(729),
@@ -46935,10 +47015,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1493),
+            id: DeclarationId(1496),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(1492),
+                DeclarationId(1495),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -46952,7 +47032,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1494),
+            id: DeclarationId(1497),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -46972,7 +47052,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 22268, 22289),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1495),
+            id: DeclarationId(1498),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(167),
@@ -46989,7 +47069,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1496),
+            id: DeclarationId(1499),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(197),
@@ -47006,7 +47086,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1497),
+            id: DeclarationId(1500),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(197),
@@ -47023,7 +47103,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1498),
+            id: DeclarationId(1501),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -47043,7 +47123,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 37237, 37258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1499),
+            id: DeclarationId(1502),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -47063,7 +47143,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 37264, 37295),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1500),
+            id: DeclarationId(1503),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47082,7 +47162,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 7532, 7561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1501),
+            id: DeclarationId(1504),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47101,7 +47181,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 7566, 7595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1502),
+            id: DeclarationId(1505),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -47121,7 +47201,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 7627, 7645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1503),
+            id: DeclarationId(1506),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -47141,12 +47221,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 8066, 8084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1504),
+            id: DeclarationId(1507),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1503),
+                    ty: DeclarationId(1506),
                 }],
             },
             type_params: vec![],
@@ -47160,7 +47240,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 8036, 8086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1505),
+            id: DeclarationId(1508),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -47185,7 +47265,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 8091, 8147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1506),
+            id: DeclarationId(1509),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47204,7 +47284,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 8510, 8555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1507),
+            id: DeclarationId(1510),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -47233,7 +47313,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 8560, 8630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1508),
+            id: DeclarationId(1511),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47247,7 +47327,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 14355, 14365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1509),
+            id: DeclarationId(1512),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47266,7 +47346,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 14370, 14408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1510),
+            id: DeclarationId(1513),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47285,7 +47365,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 14413, 14451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1511),
+            id: DeclarationId(1514),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47304,7 +47384,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 14697, 14732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1512),
+            id: DeclarationId(1515),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47318,7 +47398,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 14737, 14749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1513),
+            id: DeclarationId(1516),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47337,7 +47417,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 15171, 15200),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1514),
+            id: DeclarationId(1517),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47356,7 +47436,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 15205, 15230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1515),
+            id: DeclarationId(1518),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47370,7 +47450,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 15743, 15753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1516),
+            id: DeclarationId(1519),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47389,7 +47469,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 15758, 15796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1517),
+            id: DeclarationId(1520),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47408,7 +47488,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 16501, 16528),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1518),
+            id: DeclarationId(1521),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47427,7 +47507,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 16533, 16561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1519),
+            id: DeclarationId(1522),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -47447,12 +47527,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 16589, 16601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1520),
+            id: DeclarationId(1523),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1519),
+                    ty: DeclarationId(1522),
                 }],
             },
             type_params: vec![],
@@ -47466,7 +47546,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 16566, 16603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1521),
+            id: DeclarationId(1524),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47480,7 +47560,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 17280, 17293),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1522),
+            id: DeclarationId(1525),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47494,7 +47574,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 17298, 17312),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1523),
+            id: DeclarationId(1526),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47513,7 +47593,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 17317, 17349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1524),
+            id: DeclarationId(1527),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47532,7 +47612,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 19519, 19560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1525),
+            id: DeclarationId(1528),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -47557,7 +47637,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 19565, 19634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1526),
+            id: DeclarationId(1529),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -47594,7 +47674,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 19639, 19789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1527),
+            id: DeclarationId(1530),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47608,7 +47688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20538, 20559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1528),
+            id: DeclarationId(1531),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(729),
@@ -47628,12 +47708,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20590, 20617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1529),
+            id: DeclarationId(1532),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "first_breaker".to_string(),
-                    ty: DeclarationId(1528),
+                    ty: DeclarationId(1531),
                 }],
             },
             type_params: vec![],
@@ -47647,7 +47727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20564, 20619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1530),
+            id: DeclarationId(1533),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -47667,12 +47747,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24543, 24564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1531),
+            id: DeclarationId(1534),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ops".to_string(),
-                    ty: DeclarationId(1530),
+                    ty: DeclarationId(1533),
                 }],
             },
             type_params: vec![],
@@ -47686,7 +47766,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24523, 24566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1532),
+            id: DeclarationId(1535),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(646),
@@ -47706,12 +47786,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24592, 24619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1533),
+            id: DeclarationId(1536),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "arms".to_string(),
-                    ty: DeclarationId(1532),
+                    ty: DeclarationId(1535),
                 }],
             },
             type_params: vec![],
@@ -47725,7 +47805,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24571, 24621),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1534),
+            id: DeclarationId(1537),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47744,7 +47824,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24626, 24661),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1535),
+            id: DeclarationId(1538),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(646),
@@ -47764,12 +47844,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24693, 24725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1536),
+            id: DeclarationId(1539),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "branches".to_string(),
-                    ty: DeclarationId(1535),
+                    ty: DeclarationId(1538),
                 }],
             },
             type_params: vec![],
@@ -47783,7 +47863,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24666, 24727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1537),
+            id: DeclarationId(1540),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47802,7 +47882,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 25364, 25410),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1538),
+            id: DeclarationId(1541),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47821,7 +47901,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 25415, 25467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1539),
+            id: DeclarationId(1542),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47835,7 +47915,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 25964, 25984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1540),
+            id: DeclarationId(1543),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47849,7 +47929,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 25989, 26010),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1541),
+            id: DeclarationId(1544),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47863,7 +47943,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 26015, 26038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1542),
+            id: DeclarationId(1545),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47877,7 +47957,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 26043, 26061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1543),
+            id: DeclarationId(1546),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47891,7 +47971,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 26066, 26084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1544),
+            id: DeclarationId(1547),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47910,7 +47990,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 26401, 26447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1545),
+            id: DeclarationId(1548),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47929,7 +48009,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 26452, 26504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1546),
+            id: DeclarationId(1549),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47943,7 +48023,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 33114, 33120),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1547),
+            id: DeclarationId(1550),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47962,7 +48042,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 33125, 33162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1548),
+            id: DeclarationId(1551),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47981,7 +48061,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 33167, 33204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1549),
+            id: DeclarationId(1552),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47995,7 +48075,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 33678, 33697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1550),
+            id: DeclarationId(1553),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48014,7 +48094,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 33702, 33751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1551),
+            id: DeclarationId(1554),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(699),
@@ -48031,7 +48111,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18570, 18578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1552),
+            id: DeclarationId(1555),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(743),
@@ -48048,7 +48128,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18627, 18636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1553),
+            id: DeclarationId(1556),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(743),
@@ -48065,7 +48145,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18702, 18711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1554),
+            id: DeclarationId(1557),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(716),
@@ -48082,7 +48162,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19088, 19100),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1555),
+            id: DeclarationId(1558),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(673),
@@ -48099,12 +48179,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19409, 19424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1556),
+            id: DeclarationId(1559),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(993),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(991),
+                    parameter: DeclarationId(994),
                     value: DeclarationId(642),
                 }],
             },
@@ -48119,12 +48199,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23408, 23429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1557),
+            id: DeclarationId(1560),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(993),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(991),
+                    parameter: DeclarationId(994),
                     value: DeclarationId(642),
                 }],
             },
@@ -48139,7 +48219,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23493, 23514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1558),
+            id: DeclarationId(1561),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48153,7 +48233,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 479, 489),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1559),
+            id: DeclarationId(1562),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48172,7 +48252,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 494, 513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1560),
+            id: DeclarationId(1563),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48186,7 +48266,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 518, 528),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1561),
+            id: DeclarationId(1564),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(640),
@@ -48203,7 +48283,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1562),
+            id: DeclarationId(1565),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48222,7 +48302,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 791, 802),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1563),
+            id: DeclarationId(1566),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48241,7 +48321,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 807, 820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1564),
+            id: DeclarationId(1567),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48260,7 +48340,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 825, 842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1565),
+            id: DeclarationId(1568),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48279,7 +48359,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 2873, 2893),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1566),
+            id: DeclarationId(1569),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48298,7 +48378,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 2898, 2926),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1567),
+            id: DeclarationId(1570),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48317,7 +48397,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 2931, 2965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1568),
+            id: DeclarationId(1571),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48336,7 +48416,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 2970, 2999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1569),
+            id: DeclarationId(1572),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48355,7 +48435,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3004, 3021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1570),
+            id: DeclarationId(1573),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48369,7 +48449,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3625, 3632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1571),
+            id: DeclarationId(1574),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48388,7 +48468,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3637, 3687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1572),
+            id: DeclarationId(1575),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48407,7 +48487,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 5251, 5275),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1573),
+            id: DeclarationId(1576),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48421,7 +48501,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 5300, 5309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1574),
+            id: DeclarationId(1577),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48440,7 +48520,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 5314, 5350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1575),
+            id: DeclarationId(1578),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -48465,7 +48545,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 5662, 5712),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1576),
+            id: DeclarationId(1579),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48479,7 +48559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 5717, 5726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1577),
+            id: DeclarationId(1580),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(704),
@@ -48499,12 +48579,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6302, 6315),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1578),
+            id: DeclarationId(1581),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1577),
+                    ty: DeclarationId(1580),
                 }],
             },
             type_params: vec![],
@@ -48518,7 +48598,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6290, 6316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1579),
+            id: DeclarationId(1582),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48532,7 +48612,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6321, 6338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1580),
+            id: DeclarationId(1583),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48551,7 +48631,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6589, 6599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1581),
+            id: DeclarationId(1584),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48565,7 +48645,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6604, 6613),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1582),
+            id: DeclarationId(1585),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48579,7 +48659,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6618, 6627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1583),
+            id: DeclarationId(1586),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48598,7 +48678,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7054, 7074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1584),
+            id: DeclarationId(1587),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48617,7 +48697,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7079, 7103),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1585),
+            id: DeclarationId(1588),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -48637,12 +48717,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7115, 7131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1586),
+            id: DeclarationId(1589),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1585),
+                    ty: DeclarationId(1588),
                 }],
             },
             type_params: vec![],
@@ -48656,7 +48736,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7108, 7132),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1587),
+            id: DeclarationId(1590),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -48676,12 +48756,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7142, 7158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1588),
+            id: DeclarationId(1591),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1587),
+                    ty: DeclarationId(1590),
                 }],
             },
             type_params: vec![],
@@ -48695,7 +48775,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7137, 7159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1589),
+            id: DeclarationId(1592),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -48715,12 +48795,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7168, 7184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1590),
+            id: DeclarationId(1593),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1589),
+                    ty: DeclarationId(1592),
                 }],
             },
             type_params: vec![],
@@ -48734,7 +48814,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7164, 7185),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1591),
+            id: DeclarationId(1594),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -48754,7 +48834,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7248, 7264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1592),
+            id: DeclarationId(1595),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -48764,7 +48844,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(1591),
+                        ty: DeclarationId(1594),
                     },
                 ],
             },
@@ -48779,7 +48859,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7190, 7270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1593),
+            id: DeclarationId(1596),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48798,7 +48878,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7429, 7458),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1594),
+            id: DeclarationId(1597),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -48818,12 +48898,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7493, 7509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1595),
+            id: DeclarationId(1598),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1594),
+                    ty: DeclarationId(1597),
                 }],
             },
             type_params: vec![],
@@ -48837,7 +48917,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7463, 7511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1596),
+            id: DeclarationId(1599),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -48857,12 +48937,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7529, 7545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1597),
+            id: DeclarationId(1600),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1596),
+                    ty: DeclarationId(1599),
                 }],
             },
             type_params: vec![],
@@ -48876,7 +48956,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7516, 7546),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1598),
+            id: DeclarationId(1601),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48895,7 +48975,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7881, 7900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1599),
+            id: DeclarationId(1602),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48914,7 +48994,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7905, 7939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1600),
+            id: DeclarationId(1603),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48928,7 +49008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7944, 7951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1601),
+            id: DeclarationId(1604),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48942,7 +49022,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7956, 7962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1602),
+            id: DeclarationId(1605),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48961,7 +49041,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7967, 7987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1603),
+            id: DeclarationId(1606),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48980,7 +49060,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8216, 8233),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1604),
+            id: DeclarationId(1607),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49000,12 +49080,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8255, 8270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1605),
+            id: DeclarationId(1608),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "children".to_string(),
-                    ty: DeclarationId(1604),
+                    ty: DeclarationId(1607),
                 }],
             },
             type_params: vec![],
@@ -49019,7 +49099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8238, 8272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1606),
+            id: DeclarationId(1609),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49039,12 +49119,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8294, 8309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1607),
+            id: DeclarationId(1610),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "variants".to_string(),
-                    ty: DeclarationId(1606),
+                    ty: DeclarationId(1609),
                 }],
             },
             type_params: vec![],
@@ -49058,7 +49138,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8277, 8311),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1608),
+            id: DeclarationId(1611),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49078,13 +49158,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8338, 8357),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1609),
+            id: DeclarationId(1612),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1608),
+                        ty: DeclarationId(1611),
                     },
                     Field {
                         label: "output".to_string(),
@@ -49107,7 +49187,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8316, 8413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1610),
+            id: DeclarationId(1613),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49132,7 +49212,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8418, 8496),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1611),
+            id: DeclarationId(1614),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49152,7 +49232,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8564, 8586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1612),
+            id: DeclarationId(1615),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49162,7 +49242,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "arguments".to_string(),
-                        ty: DeclarationId(1611),
+                        ty: DeclarationId(1614),
                     },
                 ],
             },
@@ -49177,7 +49257,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8501, 8592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1613),
+            id: DeclarationId(1616),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(197),
@@ -49194,7 +49274,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8641, 8648),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1614),
+            id: DeclarationId(1617),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49214,7 +49294,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8693, 8712),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1615),
+            id: DeclarationId(1618),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49234,7 +49314,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8731, 8753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1616),
+            id: DeclarationId(1619),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(642),
@@ -49251,7 +49331,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8766, 8780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1617),
+            id: DeclarationId(1620),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(642),
@@ -49268,7 +49348,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8793, 8807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1618),
+            id: DeclarationId(1621),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(713),
@@ -49285,7 +49365,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8822, 8832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1619),
+            id: DeclarationId(1622),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(718),
@@ -49302,7 +49382,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8852, 8867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1620),
+            id: DeclarationId(1623),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49322,7 +49402,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9990, 10009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1621),
+            id: DeclarationId(1624),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49336,7 +49416,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 10290, 10293),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1622),
+            id: DeclarationId(1625),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49350,7 +49430,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 10298, 10301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1623),
+            id: DeclarationId(1626),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49364,7 +49444,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 10306, 10309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1624),
+            id: DeclarationId(1627),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49378,7 +49458,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 10314, 10317),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1625),
+            id: DeclarationId(1628),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49392,7 +49472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 10441, 10443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1626),
+            id: DeclarationId(1629),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49406,7 +49486,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 10448, 10450),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1627),
+            id: DeclarationId(1630),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49420,7 +49500,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 10455, 10457),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1628),
+            id: DeclarationId(1631),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49434,7 +49514,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 10462, 10464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1629),
+            id: DeclarationId(1632),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49448,7 +49528,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 10469, 10471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1630),
+            id: DeclarationId(1633),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49462,7 +49542,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 10476, 10478),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1631),
+            id: DeclarationId(1634),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49476,7 +49556,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 10731, 10734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1632),
+            id: DeclarationId(1635),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49490,7 +49570,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 10739, 10741),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1633),
+            id: DeclarationId(1636),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49509,7 +49589,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 10977, 11001),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1634),
+            id: DeclarationId(1637),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49528,7 +49608,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11006, 11030),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1635),
+            id: DeclarationId(1638),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49547,7 +49627,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11035, 11053),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1636),
+            id: DeclarationId(1639),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49566,7 +49646,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11240, 11263),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1637),
+            id: DeclarationId(1640),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(642),
@@ -49583,7 +49663,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11328, 11342),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1638),
+            id: DeclarationId(1641),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49593,7 +49673,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "field_child".to_string(),
-                        ty: DeclarationId(1637),
+                        ty: DeclarationId(1640),
                     },
                 ],
             },
@@ -49608,7 +49688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11268, 11348),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1639),
+            id: DeclarationId(1642),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49627,7 +49707,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11353, 11375),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1640),
+            id: DeclarationId(1643),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49652,7 +49732,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11500, 11552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1641),
+            id: DeclarationId(1644),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49671,7 +49751,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11557, 11587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1642),
+            id: DeclarationId(1645),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(725),
@@ -49688,7 +49768,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11751, 11766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1643),
+            id: DeclarationId(1646),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(646),
@@ -49708,7 +49788,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13742, 13773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1644),
+            id: DeclarationId(1647),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(644),
@@ -49728,7 +49808,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13797, 13827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1645),
+            id: DeclarationId(1648),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49747,7 +49827,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14450, 14479),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1646),
+            id: DeclarationId(1649),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49772,7 +49852,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14484, 14531),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1647),
+            id: DeclarationId(1650),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(673),
@@ -49789,7 +49869,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14800, 14815),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1648),
+            id: DeclarationId(1651),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49809,7 +49889,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14889, 14901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1649),
+            id: DeclarationId(1652),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49823,7 +49903,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15142, 15151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1650),
+            id: DeclarationId(1653),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49843,7 +49923,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15209, 15225),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1651),
+            id: DeclarationId(1654),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(738),
@@ -49860,7 +49940,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15289, 15313),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1652),
+            id: DeclarationId(1655),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49874,7 +49954,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15727, 15739),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1653),
+            id: DeclarationId(1656),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -49894,7 +49974,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15817, 15829),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1654),
+            id: DeclarationId(1657),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(673),
@@ -49911,7 +49991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15867, 15882),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1655),
+            id: DeclarationId(1658),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(741),
@@ -49928,7 +50008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15905, 15927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1656),
+            id: DeclarationId(1659),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49947,7 +50027,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 16019, 16035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1657),
+            id: DeclarationId(1660),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49966,7 +50046,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 16040, 16064),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1658),
+            id: DeclarationId(1661),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49985,7 +50065,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 16069, 16087),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1659),
+            id: DeclarationId(1662),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50004,7 +50084,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 16092, 16106),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1660),
+            id: DeclarationId(1663),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50023,7 +50103,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 16111, 16125),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1661),
+            id: DeclarationId(1664),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -50043,7 +50123,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 16154, 16171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1662),
+            id: DeclarationId(1665),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -50063,7 +50143,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 16181, 16195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1663),
+            id: DeclarationId(1666),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -50083,7 +50163,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 16205, 16218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1664),
+            id: DeclarationId(1667),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -50103,7 +50183,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 16231, 16244),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1665),
+            id: DeclarationId(1668),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50122,7 +50202,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 21450, 21468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1666),
+            id: DeclarationId(1669),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50136,7 +50216,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 21473, 21479),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1667),
+            id: DeclarationId(1670),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(646),
@@ -50156,12 +50236,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 21512, 21536),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1668),
+            id: DeclarationId(1671),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "candidates".to_string(),
-                    ty: DeclarationId(1667),
+                    ty: DeclarationId(1670),
                 }],
             },
             type_params: vec![],
@@ -50175,12 +50255,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 21484, 21538),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1669),
+            id: DeclarationId(1672),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(993),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(991),
+                    parameter: DeclarationId(994),
                     value: DeclarationId(762),
                 }],
             },
@@ -50195,12 +50275,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9849, 9869),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1670),
+            id: DeclarationId(1673),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(993),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(991),
+                    parameter: DeclarationId(994),
                     value: DeclarationId(762),
                 }],
             },
@@ -50215,7 +50295,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9933, 9953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1671),
+            id: DeclarationId(1674),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(646),
@@ -50235,7 +50315,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 10021, 10051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1672),
+            id: DeclarationId(1675),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -50255,7 +50335,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 10518, 10536),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1673),
+            id: DeclarationId(1676),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(646),
@@ -50275,7 +50355,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 10542, 10572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1674),
+            id: DeclarationId(1677),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -50295,7 +50375,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 13069, 13087),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1675),
+            id: DeclarationId(1678),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(646),
@@ -50315,7 +50395,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 17290, 17320),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1676),
+            id: DeclarationId(1679),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -50335,7 +50415,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 17325, 17343),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1677),
+            id: DeclarationId(1680),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -50355,7 +50435,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 17594, 17612),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1678),
+            id: DeclarationId(1681),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -50375,7 +50455,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 17617, 17635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1679),
+            id: DeclarationId(1682),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -50395,7 +50475,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18901, 18919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1680),
+            id: DeclarationId(1683),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -50415,7 +50495,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 19172, 19190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1681),
+            id: DeclarationId(1684),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -50435,7 +50515,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 19638, 19656),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1682),
+            id: DeclarationId(1685),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -50455,7 +50535,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 21673, 21691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1683),
+            id: DeclarationId(1686),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -50475,7 +50555,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 21721, 21739),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1684),
+            id: DeclarationId(1687),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -50495,7 +50575,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22026, 22044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1685),
+            id: DeclarationId(1688),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -50515,7 +50595,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22072, 22090),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1686),
+            id: DeclarationId(1689),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -50535,7 +50615,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22450, 22468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1687),
+            id: DeclarationId(1690),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -50555,7 +50635,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22473, 22491),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1688),
+            id: DeclarationId(1691),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50569,7 +50649,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4805, 4817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1689),
+            id: DeclarationId(1692),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50583,7 +50663,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4822, 4838),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1690),
+            id: DeclarationId(1693),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50597,7 +50677,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4843, 4857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1691),
+            id: DeclarationId(1694),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50611,7 +50691,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5707, 5720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1692),
+            id: DeclarationId(1695),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50625,7 +50705,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5725, 5740),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1693),
+            id: DeclarationId(1696),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50639,7 +50719,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5745, 5761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1694),
+            id: DeclarationId(1697),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50653,7 +50733,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5766, 5779),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1695),
+            id: DeclarationId(1698),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(757),
@@ -50670,7 +50750,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6632, 6653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1696),
+            id: DeclarationId(1699),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(758),
@@ -50687,7 +50767,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6668, 6678),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1697),
+            id: DeclarationId(1700),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -50704,7 +50784,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6708, 6712),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1698),
+            id: DeclarationId(1701),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50718,7 +50798,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8181, 8190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1699),
+            id: DeclarationId(1702),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50737,7 +50817,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8195, 8241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1700),
+            id: DeclarationId(1703),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50756,7 +50836,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8413, 8430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1701),
+            id: DeclarationId(1704),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50775,7 +50855,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8435, 8459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1702),
+            id: DeclarationId(1705),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -50800,7 +50880,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8464, 8526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1703),
+            id: DeclarationId(1706),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(646),
@@ -50820,12 +50900,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8543, 8573),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1704),
+            id: DeclarationId(1707),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1703),
+                    ty: DeclarationId(1706),
                 }],
             },
             type_params: vec![],
@@ -50839,7 +50919,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8531, 8574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1705),
+            id: DeclarationId(1708),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(646),
@@ -50859,12 +50939,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8587, 8617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1706),
+            id: DeclarationId(1709),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1705),
+                    ty: DeclarationId(1708),
                 }],
             },
             type_params: vec![],
@@ -50878,7 +50958,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8579, 8618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1707),
+            id: DeclarationId(1710),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50897,7 +50977,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8623, 8644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1708),
+            id: DeclarationId(1711),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50916,7 +50996,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8649, 8668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1709),
+            id: DeclarationId(1712),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(610),
@@ -50936,7 +51016,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 10402, 10414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1710),
+            id: DeclarationId(1713),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(647)],
@@ -50954,7 +51034,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1711),
+            id: DeclarationId(1714),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(623),
@@ -50964,7 +51044,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(762),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1466),
+                        parameter: DeclarationId(1469),
                         value: DeclarationId(769),
                     },
                 ],
@@ -50980,7 +51060,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 10395, 10442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1712),
+            id: DeclarationId(1715),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(610),
@@ -51000,7 +51080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 10702, 10717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1713),
+            id: DeclarationId(1716),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(762), DeclarationId(762)],
@@ -51018,7 +51098,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1714),
+            id: DeclarationId(1717),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(612),
@@ -51032,7 +51112,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(762),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1456),
+                        parameter: DeclarationId(1459),
                         value: DeclarationId(773),
                     },
                 ],
@@ -51048,7 +51128,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 13109, 13152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1715),
+            id: DeclarationId(1718),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(763), DeclarationId(613)],
@@ -51066,7 +51146,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1716),
+            id: DeclarationId(1719),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(612),
@@ -51076,7 +51156,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(763),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1456),
+                        parameter: DeclarationId(1459),
                         value: DeclarationId(790),
                     },
                     TemplateArgument {
@@ -51096,7 +51176,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 15818, 15928),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1717),
+            id: DeclarationId(1720),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(763), DeclarationId(613)],
@@ -51114,7 +51194,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1718),
+            id: DeclarationId(1721),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(612),
@@ -51124,7 +51204,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(763),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1456),
+                        parameter: DeclarationId(1459),
                         value: DeclarationId(790),
                     },
                     TemplateArgument {
@@ -51144,7 +51224,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 15983, 16093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1719),
+            id: DeclarationId(1722),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -51164,7 +51244,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 17366, 17396),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1720),
+            id: DeclarationId(1723),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -51184,7 +51264,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 17348, 17397),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1721),
+            id: DeclarationId(1724),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51204,7 +51284,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 17667, 17674),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1722),
+            id: DeclarationId(1725),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -51224,7 +51304,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 17792, 17835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1723),
+            id: DeclarationId(1726),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -51244,7 +51324,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 19105, 19137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1724),
+            id: DeclarationId(1727),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51264,7 +51344,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 21776, 21783),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1725),
+            id: DeclarationId(1728),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -51284,7 +51364,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 21924, 21989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1726),
+            id: DeclarationId(1729),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(763), DeclarationId(762)],
@@ -51302,7 +51382,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1727),
+            id: DeclarationId(1730),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(612),
@@ -51316,7 +51396,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(762),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1456),
+                        parameter: DeclarationId(1459),
                         value: DeclarationId(790),
                     },
                 ],
@@ -51332,7 +51412,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22107, 22165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1728),
+            id: DeclarationId(1731),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -51352,7 +51432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22191, 22237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1729),
+            id: DeclarationId(1732),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51372,11 +51452,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22508, 22515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1730),
+            id: DeclarationId(1733),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1687), DeclarationId(762)],
-                output: DeclarationId(1687),
+                inputs: vec![DeclarationId(1690), DeclarationId(762)],
+                output: DeclarationId(1690),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -51390,21 +51470,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1731),
+            id: DeclarationId(1734),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(612),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(614),
-                        value: DeclarationId(1687),
+                        value: DeclarationId(1690),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(613),
                         value: DeclarationId(762),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1456),
+                        parameter: DeclarationId(1459),
                         value: DeclarationId(793),
                     },
                 ],
@@ -51420,7 +51500,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22496, 22537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1732),
+            id: DeclarationId(1735),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -51440,7 +51520,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4503, 4529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1733),
+            id: DeclarationId(1736),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(86),
@@ -51457,7 +51537,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1734),
+            id: DeclarationId(1737),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(197),
@@ -51474,13 +51554,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1735),
+            id: DeclarationId(1738),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1009),
+                    value: DeclarationId(1012),
                 }],
             },
             type_params: vec![],
@@ -51494,7 +51574,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6542, 6557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1736),
+            id: DeclarationId(1739),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -51514,12 +51594,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2549, 2580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1737),
+            id: DeclarationId(1740),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(1736),
+                    ty: DeclarationId(1739),
                 }],
             },
             type_params: vec![],
@@ -51533,7 +51613,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2521, 2582),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1738),
+            id: DeclarationId(1741),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -51553,12 +51633,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2615, 2651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1739),
+            id: DeclarationId(1742),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(1738),
+                    ty: DeclarationId(1741),
                 }],
             },
             type_params: vec![],
@@ -51572,7 +51652,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2587, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1740),
+            id: DeclarationId(1743),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51591,7 +51671,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3068, 3104),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1741),
+            id: DeclarationId(1744),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(99),
@@ -51608,7 +51688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3179, 3184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1742),
+            id: DeclarationId(1745),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -51622,7 +51702,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "is_error".to_string(),
-                        ty: DeclarationId(1741),
+                        ty: DeclarationId(1744),
                     },
                 ],
             },
@@ -51637,7 +51717,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3109, 3186),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1743),
+            id: DeclarationId(1746),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51656,7 +51736,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3633, 3671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1744),
+            id: DeclarationId(1747),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -51685,7 +51765,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3676, 3739),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1745),
+            id: DeclarationId(1748),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51699,7 +51779,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4097, 4104),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1746),
+            id: DeclarationId(1749),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51713,7 +51793,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4109, 4118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1747),
+            id: DeclarationId(1750),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51727,7 +51807,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4123, 4135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1748),
+            id: DeclarationId(1751),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51741,7 +51821,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4140, 4147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1749),
+            id: DeclarationId(1752),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51755,7 +51835,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4152, 4161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1750),
+            id: DeclarationId(1753),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51769,7 +51849,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4166, 4173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1751),
+            id: DeclarationId(1754),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51783,7 +51863,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4178, 4204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1752),
+            id: DeclarationId(1755),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -51803,7 +51883,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5538, 5573),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1753),
+            id: DeclarationId(1756),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(197),
@@ -51820,7 +51900,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1754),
+            id: DeclarationId(1757),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51831,10 +51911,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 779, 792),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1207, 1220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1755),
+            id: DeclarationId(1758),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51845,10 +51925,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 797, 803),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1225, 1231),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1756),
+            id: DeclarationId(1759),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51859,10 +51939,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 808, 826),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1236, 1254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1757),
+            id: DeclarationId(1760),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51873,10 +51953,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 831, 849),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1259, 1277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1758),
+            id: DeclarationId(1761),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51887,10 +51967,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 854, 868),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1282, 1296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1759),
+            id: DeclarationId(1762),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51901,10 +51981,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1150, 1159),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1578, 1587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1760),
+            id: DeclarationId(1763),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -51926,10 +52006,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1164, 1241),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1592, 1669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1761),
+            id: DeclarationId(1764),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -51951,10 +52031,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1246, 1316),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1674, 1744),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1762),
+            id: DeclarationId(1765),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51965,10 +52045,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1518, 1523),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1946, 1951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1763),
+            id: DeclarationId(1766),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51979,10 +52059,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1526, 1534),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1954, 1962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1764),
+            id: DeclarationId(1767),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51993,10 +52073,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1537, 1557),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1965, 1985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1765),
+            id: DeclarationId(1768),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52007,10 +52087,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1769, 1779),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2197, 2207),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1766),
+            id: DeclarationId(1769),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52021,10 +52101,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1782, 1796),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2210, 2224),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1767),
+            id: DeclarationId(1770),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52035,10 +52115,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2013, 2025),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2441, 2453),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1768),
+            id: DeclarationId(1771),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52049,10 +52129,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2028, 2038),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2456, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1769),
+            id: DeclarationId(1772),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52063,10 +52143,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2258, 2270),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2686, 2698),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1770),
+            id: DeclarationId(1773),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52077,10 +52157,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2273, 2289),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2701, 2717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1771),
+            id: DeclarationId(1774),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52091,10 +52171,30 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2292, 2303),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2720, 2731),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1772),
+            id: DeclarationId(1775),
+            name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(39),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(40),
+                    value: DeclarationId(812),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3376, 3384),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1776),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52108,7 +52208,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4314, 4321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1773),
+            id: DeclarationId(1777),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52122,13 +52222,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4326, 4330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1774),
+            id: DeclarationId(1778),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(813),
+                    value: DeclarationId(816),
                 }],
             },
             type_params: vec![],
@@ -52142,7 +52242,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6578, 6599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1775),
+            id: DeclarationId(1779),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52156,7 +52256,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2224, 2238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1776),
+            id: DeclarationId(1780),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52170,7 +52270,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2243, 2268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1777),
+            id: DeclarationId(1781),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52184,7 +52284,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2273, 2283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1778),
+            id: DeclarationId(1782),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52198,7 +52298,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2548, 2565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1779),
+            id: DeclarationId(1783),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52212,7 +52312,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2570, 2594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1780),
+            id: DeclarationId(1784),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52226,7 +52326,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2599, 2631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1781),
+            id: DeclarationId(1785),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52240,7 +52340,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2636, 2663),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1782),
+            id: DeclarationId(1786),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52254,7 +52354,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3369, 3393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1783),
+            id: DeclarationId(1787),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52268,7 +52368,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3398, 3430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1784),
+            id: DeclarationId(1788),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52282,7 +52382,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3564, 3588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1785),
+            id: DeclarationId(1789),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52296,7 +52396,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3593, 3614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1786),
+            id: DeclarationId(1790),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52310,7 +52410,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3619, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1787),
+            id: DeclarationId(1791),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52324,7 +52424,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3781, 3796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1788),
+            id: DeclarationId(1792),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52338,7 +52438,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3801, 3831),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1789),
+            id: DeclarationId(1793),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52352,7 +52452,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3836, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1790),
+            id: DeclarationId(1794),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52366,7 +52466,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4024, 4044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1791),
+            id: DeclarationId(1795),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52380,7 +52480,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4049, 4076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1792),
+            id: DeclarationId(1796),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52394,7 +52494,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4081, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1793),
+            id: DeclarationId(1797),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52408,7 +52508,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4354, 4362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1794),
+            id: DeclarationId(1798),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52422,7 +52522,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4367, 4393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1795),
+            id: DeclarationId(1799),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52436,7 +52536,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4398, 4423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1796),
+            id: DeclarationId(1800),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -52456,7 +52556,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5320, 5332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1797),
+            id: DeclarationId(1801),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52470,7 +52570,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5693, 5713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1798),
+            id: DeclarationId(1802),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52484,7 +52584,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5718, 5736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1799),
+            id: DeclarationId(1803),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52498,7 +52598,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5741, 5759),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1800),
+            id: DeclarationId(1804),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52512,7 +52612,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5764, 5791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1801),
+            id: DeclarationId(1805),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(197),
@@ -52529,7 +52629,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5361, 5368),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1802),
+            id: DeclarationId(1806),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -52546,10 +52646,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 6292, 6296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1803),
+            id: DeclarationId(1807),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(839),
+                DeclarationId(842),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -52563,10 +52663,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7350, 7369),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1804),
+            id: DeclarationId(1808),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(839),
+                DeclarationId(842),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -52580,7 +52680,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7915, 7934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1805),
+            id: DeclarationId(1809),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52599,7 +52699,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1356, 1388),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1806),
+            id: DeclarationId(1810),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52618,7 +52718,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1393, 1429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1807),
+            id: DeclarationId(1811),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52637,7 +52737,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1434, 1471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1808),
+            id: DeclarationId(1812),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52656,7 +52756,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1476, 1502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1809),
+            id: DeclarationId(1813),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52675,7 +52775,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1507, 1540),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1810),
+            id: DeclarationId(1814),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52689,12 +52789,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1545, 1562),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1811),
+            id: DeclarationId(1815),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1018),
+                    ty: DeclarationId(1021),
                 }],
             },
             type_params: vec![],
@@ -52708,7 +52808,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1567, 1621),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1812),
+            id: DeclarationId(1816),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52722,7 +52822,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1626, 1633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1813),
+            id: DeclarationId(1817),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52741,13 +52841,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2165, 2203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1814),
+            id: DeclarationId(1818),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "amount".to_string(),
-                        ty: DeclarationId(1018),
+                        ty: DeclarationId(1021),
                     },
                     Field {
                         label: "collection".to_string(),
@@ -52766,13 +52866,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2208, 2282),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1815),
+            id: DeclarationId(1819),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "steps".to_string(),
-                        ty: DeclarationId(1018),
+                        ty: DeclarationId(1021),
                     },
                     Field {
                         label: "ring_param".to_string(),
@@ -52791,13 +52891,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2287, 2362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1816),
+            id: DeclarationId(1820),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "divisor".to_string(),
-                        ty: DeclarationId(1019),
+                        ty: DeclarationId(1022),
                     },
                     Field {
                         label: "ring_param".to_string(),
@@ -52816,7 +52916,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2367, 2440),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1817),
+            id: DeclarationId(1821),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52835,7 +52935,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2445, 2482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1818),
+            id: DeclarationId(1822),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52854,7 +52954,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2487, 2524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1819),
+            id: DeclarationId(1823),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52873,7 +52973,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2529, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1820),
+            id: DeclarationId(1824),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52887,7 +52987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2575, 2591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1821),
+            id: DeclarationId(1825),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52901,12 +53001,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2803, 2813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1822),
+            id: DeclarationId(1826),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1018),
+                    ty: DeclarationId(1021),
                 }],
             },
             type_params: vec![],
@@ -52920,12 +53020,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2818, 2865),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1823),
+            id: DeclarationId(1827),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "divisor".to_string(),
-                    ty: DeclarationId(1019),
+                    ty: DeclarationId(1022),
                 }],
             },
             type_params: vec![],
@@ -52939,7 +53039,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2870, 2921),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1824),
+            id: DeclarationId(1828),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52953,7 +53053,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3111, 3115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1825),
+            id: DeclarationId(1829),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52967,7 +53067,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3120, 3127),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1826),
+            id: DeclarationId(1830),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52981,10 +53081,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3132, 3138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1827),
+            id: DeclarationId(1831),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(831),
+                DeclarationId(834),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -52998,7 +53098,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3441, 3454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1828),
+            id: DeclarationId(1832),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53012,7 +53112,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7082, 7093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1829),
+            id: DeclarationId(1833),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53026,7 +53126,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7142, 7156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1830),
+            id: DeclarationId(1834),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53040,7 +53140,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7221, 7237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1831),
+            id: DeclarationId(1835),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53054,7 +53154,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 360, 369),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1832),
+            id: DeclarationId(1836),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53068,7 +53168,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 374, 381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1833),
+            id: DeclarationId(1837),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53082,7 +53182,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 614, 618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1834),
+            id: DeclarationId(1838),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53096,7 +53196,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 623, 632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1835),
+            id: DeclarationId(1839),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53110,7 +53210,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 910, 921),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1836),
+            id: DeclarationId(1840),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53124,7 +53224,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 926, 935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1837),
+            id: DeclarationId(1841),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53138,7 +53238,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1166, 1173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1838),
+            id: DeclarationId(1842),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53152,7 +53252,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1178, 1187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1839),
+            id: DeclarationId(1843),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53166,7 +53266,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2035, 2044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1840),
+            id: DeclarationId(1844),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53180,7 +53280,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2049, 2065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1841),
+            id: DeclarationId(1845),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53194,7 +53294,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2070, 2080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1842),
+            id: DeclarationId(1846),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53208,7 +53308,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2085, 2099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1843),
+            id: DeclarationId(1847),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53222,7 +53322,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2385, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1844),
+            id: DeclarationId(1848),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53236,7 +53336,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2404, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1845),
+            id: DeclarationId(1849),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -53256,7 +53356,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2818, 2830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1846),
+            id: DeclarationId(1850),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -53276,7 +53376,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3210, 3222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1847),
+            id: DeclarationId(1851),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53290,7 +53390,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3694, 3708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1848),
+            id: DeclarationId(1852),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53304,7 +53404,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3713, 3729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1849),
+            id: DeclarationId(1853),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53318,7 +53418,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1022, 1036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1850),
+            id: DeclarationId(1854),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53332,7 +53432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1041, 1051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1851),
+            id: DeclarationId(1855),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53346,7 +53446,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1056, 1068),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1852),
+            id: DeclarationId(1856),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53360,7 +53460,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1073, 1085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1853),
+            id: DeclarationId(1857),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53374,7 +53474,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1090, 1103),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1854),
+            id: DeclarationId(1858),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53388,7 +53488,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1108, 1120),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1855),
+            id: DeclarationId(1859),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53402,12 +53502,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1125, 1148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1856),
+            id: DeclarationId(1860),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(855),
+                    ty: DeclarationId(858),
                 }],
             },
             type_params: vec![],
@@ -53421,12 +53521,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5348, 5384),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1857),
+            id: DeclarationId(1861),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(858),
+                    ty: DeclarationId(861),
                 }],
             },
             type_params: vec![],
@@ -53440,13 +53540,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5389, 5430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1858),
+            id: DeclarationId(1862),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(856),
+                    value: DeclarationId(859),
                 }],
             },
             type_params: vec![],
@@ -53460,7 +53560,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5889, 5905),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1859),
+            id: DeclarationId(1863),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53479,7 +53579,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9017, 9058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1860),
+            id: DeclarationId(1864),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53493,7 +53593,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9355, 9367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1861),
+            id: DeclarationId(1865),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -53513,7 +53613,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9637, 9649),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1862),
+            id: DeclarationId(1866),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -53523,7 +53623,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "sites".to_string(),
-                        ty: DeclarationId(1861),
+                        ty: DeclarationId(1865),
                     },
                 ],
             },
@@ -53538,7 +53638,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9594, 9651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1863),
+            id: DeclarationId(1867),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53557,7 +53657,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9961, 9995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1864),
+            id: DeclarationId(1868),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53576,7 +53676,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10398, 10449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1865),
+            id: DeclarationId(1869),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53590,7 +53690,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10792, 10810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1866),
+            id: DeclarationId(1870),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -53619,13 +53719,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 11160, 11258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1867),
+            id: DeclarationId(1871),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(38),
-                    value: DeclarationId(881),
+                    value: DeclarationId(884),
                 }],
             },
             type_params: vec![],
@@ -53639,18 +53739,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4196, 4216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1868),
+            id: DeclarationId(1872),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(869),
+                template: DeclarationId(872),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(870),
-                        value: DeclarationId(880),
+                        parameter: DeclarationId(873),
+                        value: DeclarationId(883),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(871),
-                        value: DeclarationId(881),
+                        parameter: DeclarationId(874),
+                        value: DeclarationId(884),
                     },
                 ],
             },
@@ -53665,18 +53765,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4226, 4250),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1869),
+            id: DeclarationId(1873),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(869),
+                template: DeclarationId(872),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(870),
-                        value: DeclarationId(880),
+                        parameter: DeclarationId(873),
+                        value: DeclarationId(883),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(871),
-                        value: DeclarationId(881),
+                        parameter: DeclarationId(874),
+                        value: DeclarationId(884),
                     },
                 ],
             },
@@ -53691,18 +53791,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4261, 4285),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1870),
+            id: DeclarationId(1874),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(869),
+                template: DeclarationId(872),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(870),
-                        value: DeclarationId(880),
+                        parameter: DeclarationId(873),
+                        value: DeclarationId(883),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(871),
-                        value: DeclarationId(881),
+                        parameter: DeclarationId(874),
+                        value: DeclarationId(884),
                     },
                 ],
             },
@@ -53717,13 +53817,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4291, 4315),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1871),
+            id: DeclarationId(1875),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(38),
-                    value: DeclarationId(884),
+                    value: DeclarationId(887),
                 }],
             },
             type_params: vec![],
@@ -53737,18 +53837,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4392, 4412),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1872),
+            id: DeclarationId(1876),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(869),
+                template: DeclarationId(872),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(870),
-                        value: DeclarationId(883),
+                        parameter: DeclarationId(873),
+                        value: DeclarationId(886),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(871),
-                        value: DeclarationId(884),
+                        parameter: DeclarationId(874),
+                        value: DeclarationId(887),
                     },
                 ],
             },
@@ -53763,18 +53863,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4422, 4446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1873),
+            id: DeclarationId(1877),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(869),
+                template: DeclarationId(872),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(870),
-                        value: DeclarationId(883),
+                        parameter: DeclarationId(873),
+                        value: DeclarationId(886),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(871),
-                        value: DeclarationId(884),
+                        parameter: DeclarationId(874),
+                        value: DeclarationId(887),
                     },
                 ],
             },
@@ -53789,18 +53889,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4457, 4481),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1874),
+            id: DeclarationId(1878),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(869),
+                template: DeclarationId(872),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(870),
-                        value: DeclarationId(883),
+                        parameter: DeclarationId(873),
+                        value: DeclarationId(886),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(871),
-                        value: DeclarationId(884),
+                        parameter: DeclarationId(874),
+                        value: DeclarationId(887),
                     },
                 ],
             },
@@ -53815,13 +53915,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4487, 4511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1875),
+            id: DeclarationId(1879),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(38),
-                    value: DeclarationId(887),
+                    value: DeclarationId(890),
                 }],
             },
             type_params: vec![],
@@ -53835,18 +53935,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4595, 4615),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1876),
+            id: DeclarationId(1880),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(869),
+                template: DeclarationId(872),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(870),
-                        value: DeclarationId(886),
+                        parameter: DeclarationId(873),
+                        value: DeclarationId(889),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(871),
-                        value: DeclarationId(887),
+                        parameter: DeclarationId(874),
+                        value: DeclarationId(890),
                     },
                 ],
             },
@@ -53861,18 +53961,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4626, 4650),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1877),
+            id: DeclarationId(1881),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(869),
+                template: DeclarationId(872),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(870),
-                        value: DeclarationId(886),
+                        parameter: DeclarationId(873),
+                        value: DeclarationId(889),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(871),
-                        value: DeclarationId(887),
+                        parameter: DeclarationId(874),
+                        value: DeclarationId(890),
                     },
                 ],
             },
@@ -53887,13 +53987,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4675, 4699),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1878),
+            id: DeclarationId(1882),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(38),
-                    value: DeclarationId(890),
+                    value: DeclarationId(893),
                 }],
             },
             type_params: vec![],
@@ -53907,18 +54007,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4790, 4810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1879),
+            id: DeclarationId(1883),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(869),
+                template: DeclarationId(872),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(870),
-                        value: DeclarationId(889),
+                        parameter: DeclarationId(873),
+                        value: DeclarationId(892),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(871),
-                        value: DeclarationId(890),
+                        parameter: DeclarationId(874),
+                        value: DeclarationId(893),
                     },
                 ],
             },
@@ -53933,18 +54033,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4821, 4845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1880),
+            id: DeclarationId(1884),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(869),
+                template: DeclarationId(872),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(870),
-                        value: DeclarationId(889),
+                        parameter: DeclarationId(873),
+                        value: DeclarationId(892),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(871),
-                        value: DeclarationId(890),
+                        parameter: DeclarationId(874),
+                        value: DeclarationId(893),
                     },
                 ],
             },
@@ -53959,12 +54059,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4870, 4894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1881),
+            id: DeclarationId(1885),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(863),
+                    ty: DeclarationId(866),
                 }],
             },
             type_params: vec![],
@@ -53978,7 +54078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1626, 1643),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1882),
+            id: DeclarationId(1886),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54003,7 +54103,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1648, 1689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1883),
+            id: DeclarationId(1887),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54017,12 +54117,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1871, 1883),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1884),
+            id: DeclarationId(1888),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "value".to_string(),
-                    ty: DeclarationId(860),
+                    ty: DeclarationId(863),
                 }],
             },
             type_params: vec![],
@@ -54036,13 +54136,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1888, 1924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1885),
+            id: DeclarationId(1889),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(862),
+                template: DeclarationId(865),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(863),
-                    value: DeclarationId(866),
+                    parameter: DeclarationId(866),
+                    value: DeclarationId(869),
                 }],
             },
             type_params: vec![],
@@ -54056,13 +54156,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2406, 2422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1886),
+            id: DeclarationId(1890),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1885),
+                    value: DeclarationId(1889),
                 }],
             },
             type_params: vec![],
@@ -54076,7 +54176,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2401, 2423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1887),
+            id: DeclarationId(1891),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54086,11 +54186,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "composed".to_string(),
-                        ty: DeclarationId(866),
+                        ty: DeclarationId(869),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1886),
+                        ty: DeclarationId(1890),
                     },
                 ],
             },
@@ -54105,13 +54205,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2317, 2429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1888),
+            id: DeclarationId(1892),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(860),
+                    value: DeclarationId(863),
                 }],
             },
             type_params: vec![],
@@ -54125,13 +54225,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2497, 2513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1889),
+            id: DeclarationId(1893),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(862),
+                template: DeclarationId(865),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(863),
-                    value: DeclarationId(866),
+                    parameter: DeclarationId(866),
+                    value: DeclarationId(869),
                 }],
             },
             type_params: vec![],
@@ -54145,13 +54245,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2536, 2552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1890),
+            id: DeclarationId(1894),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1889),
+                    value: DeclarationId(1893),
                 }],
             },
             type_params: vec![],
@@ -54165,7 +54265,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2531, 2553),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1891),
+            id: DeclarationId(1895),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54175,11 +54275,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "violations".to_string(),
-                        ty: DeclarationId(1888),
+                        ty: DeclarationId(1892),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1890),
+                        ty: DeclarationId(1894),
                     },
                 ],
             },
@@ -54194,13 +54294,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2434, 2559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1892),
+            id: DeclarationId(1896),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(862),
+                template: DeclarationId(865),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(863),
-                    value: DeclarationId(868),
+                    parameter: DeclarationId(866),
+                    value: DeclarationId(871),
                 }],
             },
             type_params: vec![],
@@ -54214,11 +54314,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3216, 3232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1893),
+            id: DeclarationId(1897),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744), DeclarationId(743)],
-                output: DeclarationId(1892),
+                output: DeclarationId(1896),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -54232,11 +54332,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3195, 3232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1894),
+            id: DeclarationId(1898),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(868), DeclarationId(868)],
-                output: DeclarationId(868),
+                inputs: vec![DeclarationId(871), DeclarationId(871)],
+                output: DeclarationId(871),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -54250,11 +54350,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3244, 3275),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1895),
+            id: DeclarationId(1899),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(743), DeclarationId(868)],
-                output: DeclarationId(864),
+                inputs: vec![DeclarationId(743), DeclarationId(871)],
+                output: DeclarationId(867),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -54268,13 +54368,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3316, 3359),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1896),
+            id: DeclarationId(1900),
             name: Some("DimensionUnitAbelianGroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(25),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(26),
-                    value: DeclarationId(870),
+                    value: DeclarationId(873),
                 }],
             },
             type_params: vec![],
@@ -54288,13 +54388,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4002, 4052),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1897),
+            id: DeclarationId(1901),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(894),
+                    value: DeclarationId(897),
                 }],
             },
             type_params: vec![],
@@ -54308,7 +54408,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1898),
+            id: DeclarationId(1902),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54322,7 +54422,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4188, 4204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1899),
+            id: DeclarationId(1903),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54341,7 +54441,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4209, 4237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1900),
+            id: DeclarationId(1904),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54360,7 +54460,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4727, 4746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1901),
+            id: DeclarationId(1905),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54379,13 +54479,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4751, 4773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1902),
+            id: DeclarationId(1906),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(899),
+                    value: DeclarationId(902),
                 }],
             },
             type_params: vec![],
@@ -54399,7 +54499,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5142, 5165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1903),
+            id: DeclarationId(1907),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54413,7 +54513,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6162, 6170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1904),
+            id: DeclarationId(1908),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54427,7 +54527,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6175, 6183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1905),
+            id: DeclarationId(1909),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54441,7 +54541,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1906),
+            id: DeclarationId(1910),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54455,7 +54555,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6634, 6642),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1907),
+            id: DeclarationId(1911),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54469,7 +54569,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6978, 6991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1908),
+            id: DeclarationId(1912),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54483,7 +54583,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6996, 7002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1909),
+            id: DeclarationId(1913),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54497,7 +54597,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7260, 7268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1910),
+            id: DeclarationId(1914),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54511,7 +54611,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7273, 7278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1911),
+            id: DeclarationId(1915),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54525,7 +54625,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7283, 7296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1912),
+            id: DeclarationId(1916),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54539,7 +54639,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7633, 7651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1913),
+            id: DeclarationId(1917),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54553,7 +54653,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8203, 8212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1914),
+            id: DeclarationId(1918),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54567,7 +54667,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8217, 8230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1915),
+            id: DeclarationId(1919),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54581,7 +54681,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8235, 8243),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1916),
+            id: DeclarationId(1920),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54595,7 +54695,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8248, 8258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1917),
+            id: DeclarationId(1921),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54609,7 +54709,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8263, 8273),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1918),
+            id: DeclarationId(1922),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54623,7 +54723,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8278, 8289),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1919),
+            id: DeclarationId(1923),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54637,7 +54737,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8294, 8302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1920),
+            id: DeclarationId(1924),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54651,7 +54751,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8307, 8314),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1921),
+            id: DeclarationId(1925),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54665,7 +54765,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8319, 8329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1922),
+            id: DeclarationId(1926),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54679,7 +54779,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8334, 8346),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1923),
+            id: DeclarationId(1927),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54693,7 +54793,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11039, 11065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1924),
+            id: DeclarationId(1928),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54707,7 +54807,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11070, 11080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1925),
+            id: DeclarationId(1929),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54721,7 +54821,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 14808, 14814),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1926),
+            id: DeclarationId(1930),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54735,7 +54835,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 14819, 14830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1927),
+            id: DeclarationId(1931),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54749,7 +54849,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 15150, 15161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1928),
+            id: DeclarationId(1932),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54763,7 +54863,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 15166, 15177),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1929),
+            id: DeclarationId(1933),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54777,7 +54877,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17110, 17121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1930),
+            id: DeclarationId(1934),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54791,7 +54891,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17126, 17134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1931),
+            id: DeclarationId(1935),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54810,7 +54910,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 18297, 18332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1932),
+            id: DeclarationId(1936),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54835,13 +54935,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 18337, 18425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1933),
+            id: DeclarationId(1937),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(928),
+                    value: DeclarationId(931),
                 }],
             },
             type_params: vec![],
@@ -54855,10 +54955,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 2458, 2486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1934),
+            id: DeclarationId(1938),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(830),
+                DeclarationId(833),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -54872,10 +54972,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20442, 20454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1935),
+            id: DeclarationId(1939),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(833),
+                DeclarationId(836),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -54889,13 +54989,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21827, 21842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1936),
+            id: DeclarationId(1940),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(950),
+                    value: DeclarationId(953),
                 }],
             },
             type_params: vec![],
@@ -54909,7 +55009,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27734, 27749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1937),
+            id: DeclarationId(1941),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -54926,7 +55026,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 31887, 31891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1938),
+            id: DeclarationId(1942),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -54943,7 +55043,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 32183, 32187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1939),
+            id: DeclarationId(1943),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -54960,7 +55060,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33432, 33436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1940),
+            id: DeclarationId(1944),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -54977,7 +55077,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33907, 33911),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1941),
+            id: DeclarationId(1945),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -54994,7 +55094,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35170, 35174),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1942),
+            id: DeclarationId(1946),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -55011,7 +55111,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35442, 35446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1943),
+            id: DeclarationId(1947),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55025,7 +55125,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5562, 5577),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1944),
+            id: DeclarationId(1948),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55039,7 +55139,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5617, 5630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1945),
+            id: DeclarationId(1949),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55053,7 +55153,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5678, 5695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1946),
+            id: DeclarationId(1950),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55067,7 +55167,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5734, 5746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1947),
+            id: DeclarationId(1951),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55081,17 +55181,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5794, 5811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1948),
+            id: DeclarationId(1952),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "field".to_string(),
-                        ty: DeclarationId(934),
+                        ty: DeclarationId(937),
                     },
                     Field {
                         label: "factor".to_string(),
-                        ty: DeclarationId(831),
+                        ty: DeclarationId(834),
                     },
                 ],
             },
@@ -55106,12 +55206,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 9904, 9966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1949),
+            id: DeclarationId(1953),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "field".to_string(),
-                    ty: DeclarationId(934),
+                    ty: DeclarationId(937),
                 }],
             },
             type_params: vec![],
@@ -55125,7 +55225,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10013),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1950),
+            id: DeclarationId(1954),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55135,7 +55235,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "factor".to_string(),
-                        ty: DeclarationId(831),
+                        ty: DeclarationId(834),
                     },
                 ],
             },
@@ -55150,7 +55250,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10018, 10075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1951),
+            id: DeclarationId(1955),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55164,7 +55264,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10080, 10094),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1952),
+            id: DeclarationId(1956),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55178,7 +55278,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10099, 10114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1953),
+            id: DeclarationId(1957),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55192,12 +55292,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24019, 24033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1954),
+            id: DeclarationId(1958),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "degree".to_string(),
-                    ty: DeclarationId(1018),
+                    ty: DeclarationId(1021),
                 }],
             },
             type_params: vec![],
@@ -55211,17 +55311,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24038, 24085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1955),
+            id: DeclarationId(1959),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "numerator".to_string(),
-                        ty: DeclarationId(1018),
+                        ty: DeclarationId(1021),
                     },
                     Field {
                         label: "root".to_string(),
-                        ty: DeclarationId(1018),
+                        ty: DeclarationId(1021),
                     },
                 ],
             },
@@ -55236,17 +55336,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24090, 24167),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1956),
+            id: DeclarationId(1960),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "base".to_string(),
-                        ty: DeclarationId(1019),
+                        ty: DeclarationId(1022),
                     },
                     Field {
                         label: "argument".to_string(),
-                        ty: DeclarationId(1018),
+                        ty: DeclarationId(1021),
                     },
                 ],
             },
@@ -55261,7 +55361,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24172, 24246),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1957),
+            id: DeclarationId(1961),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55271,7 +55371,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "exponent".to_string(),
-                        ty: DeclarationId(947),
+                        ty: DeclarationId(950),
                     },
                 ],
             },
@@ -55286,7 +55386,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24866, 24922),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1958),
+            id: DeclarationId(1962),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55305,7 +55405,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24938, 24963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1959),
+            id: DeclarationId(1963),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55319,12 +55419,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26612, 26625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1960),
+            id: DeclarationId(1964),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "cost".to_string(),
-                    ty: DeclarationId(949),
+                    ty: DeclarationId(952),
                 }],
             },
             type_params: vec![],
@@ -55338,13 +55438,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26669, 26701),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1961),
+            id: DeclarationId(1965),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(949),
+                    value: DeclarationId(952),
                 }],
             },
             type_params: vec![],
@@ -55358,12 +55458,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26764, 26780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1962),
+            id: DeclarationId(1966),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "factors".to_string(),
-                    ty: DeclarationId(1961),
+                    ty: DeclarationId(1965),
                 }],
             },
             type_params: vec![],
@@ -55377,13 +55477,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26740, 26782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1963),
+            id: DeclarationId(1967),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(949),
+                    value: DeclarationId(952),
                 }],
             },
             type_params: vec![],
@@ -55397,13 +55497,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26844, 26860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1964),
+            id: DeclarationId(1968),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1963),
+                    value: DeclarationId(1967),
                 }],
             },
             type_params: vec![],
@@ -55417,12 +55517,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26839, 26861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1965),
+            id: DeclarationId(1969),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(1964),
+                    ty: DeclarationId(1968),
                 }],
             },
             type_params: vec![],
@@ -55436,13 +55536,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26811, 26863),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1966),
+            id: DeclarationId(1970),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(950),
+                    value: DeclarationId(953),
                 }],
             },
             type_params: vec![],
@@ -55456,12 +55556,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27161, 27176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1967),
+            id: DeclarationId(1971),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(1966),
+                    ty: DeclarationId(1970),
                 }],
             },
             type_params: vec![],
@@ -55475,7 +55575,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27143, 27178),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1968),
+            id: DeclarationId(1972),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55489,7 +55589,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27261, 27273),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1969),
+            id: DeclarationId(1973),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55503,13 +55603,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27343, 27353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1970),
+            id: DeclarationId(1974),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1063),
+                    value: DeclarationId(1066),
                 }],
             },
             type_params: vec![],
@@ -55523,13 +55623,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1234, 1254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1971),
+            id: DeclarationId(1975),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1063),
+                    value: DeclarationId(1066),
                 }],
             },
             type_params: vec![],
@@ -55543,13 +55643,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1414, 1434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1972),
+            id: DeclarationId(1976),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(862),
+                template: DeclarationId(865),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(863),
-                    value: DeclarationId(989),
+                    parameter: DeclarationId(866),
+                    value: DeclarationId(992),
                 }],
             },
             type_params: vec![],
@@ -55563,11 +55663,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1973),
+            id: DeclarationId(1977),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744), DeclarationId(743)],
-                output: DeclarationId(1972),
+                output: DeclarationId(1976),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -55581,13 +55681,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1974),
+            id: DeclarationId(1978),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(20),
-                    value: DeclarationId(989),
+                    value: DeclarationId(992),
                 }],
             },
             type_params: vec![],
@@ -55601,11 +55701,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1975),
+            id: DeclarationId(1979),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(989), DeclarationId(989)],
-                output: DeclarationId(989),
+                inputs: vec![DeclarationId(992), DeclarationId(992)],
+                output: DeclarationId(992),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -55619,11 +55719,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1976),
+            id: DeclarationId(1980),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(989), DeclarationId(734)],
-                output: DeclarationId(989),
+                inputs: vec![DeclarationId(992), DeclarationId(734)],
+                output: DeclarationId(992),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -55637,11 +55737,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1977),
+            id: DeclarationId(1981),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(744), DeclarationId(989)],
-                output: DeclarationId(864),
+                inputs: vec![DeclarationId(744), DeclarationId(992)],
+                output: DeclarationId(867),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -55655,12 +55755,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1978),
+            id: DeclarationId(1982),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(993),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(991),
+                    parameter: DeclarationId(994),
                     value: DeclarationId(81),
                 }],
             },
@@ -55675,12 +55775,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4577, 4588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1979),
+            id: DeclarationId(1983),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(990),
+                template: DeclarationId(993),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(991),
+                    parameter: DeclarationId(994),
                     value: DeclarationId(81),
                 }],
             },
@@ -55695,7 +55795,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4630, 4641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1980),
+            id: DeclarationId(1984),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55709,12 +55809,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4532, 4536),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1981),
+            id: DeclarationId(1985),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(991),
+                    ty: DeclarationId(994),
                 }],
             },
             type_params: vec![],
@@ -55728,13 +55828,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4541, 4551),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1982),
+            id: DeclarationId(1986),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(928),
+                    value: DeclarationId(931),
                 }],
             },
             type_params: vec![],
@@ -55752,7 +55852,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1983),
+            id: DeclarationId(1987),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55771,13 +55871,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2132, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1984),
+            id: DeclarationId(1988),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(997),
+                    value: DeclarationId(1000),
                 }],
             },
             type_params: vec![],
@@ -55791,12 +55891,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2174, 2190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1985),
+            id: DeclarationId(1989),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1984),
+                    ty: DeclarationId(1988),
                 }],
             },
             type_params: vec![],
@@ -55810,7 +55910,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2162, 2191),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1986),
+            id: DeclarationId(1990),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55820,7 +55920,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(998),
+                        ty: DeclarationId(1001),
                     },
                 ],
             },
@@ -55835,7 +55935,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2196, 2247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1987),
+            id: DeclarationId(1991),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55854,7 +55954,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2252, 2267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1988),
+            id: DeclarationId(1992),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55873,7 +55973,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2272, 2299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1989),
+            id: DeclarationId(1993),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -55884,7 +55984,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(110),
-                        value: DeclarationId(998),
+                        value: DeclarationId(1001),
                     },
                 ],
             },
@@ -55899,13 +55999,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 3931, 3949),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1990),
+            id: DeclarationId(1994),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1001),
+                    value: DeclarationId(1004),
                 }],
             },
             type_params: vec![],
@@ -55919,12 +56019,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 4580, 4595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1991),
+            id: DeclarationId(1995),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "input_order".to_string(),
-                    ty: DeclarationId(1004),
+                    ty: DeclarationId(1007),
                 }],
             },
             type_params: vec![],
@@ -55938,7 +56038,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5022, 5076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1992),
+            id: DeclarationId(1996),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55952,13 +56052,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5341, 5350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1993),
+            id: DeclarationId(1997),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(928),
+                    value: DeclarationId(931),
                 }],
             },
             type_params: vec![],
@@ -55972,7 +56072,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3589, 3617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1994),
+            id: DeclarationId(1998),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -55983,7 +56083,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(110),
-                        value: DeclarationId(1006),
+                        value: DeclarationId(1009),
                     },
                 ],
             },
@@ -55998,10 +56098,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/services.dag", 6838, 6861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1995),
+            id: DeclarationId(1999),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(1010),
+                DeclarationId(1013),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -56015,10 +56115,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2329, 2345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1996),
+            id: DeclarationId(2000),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(1010),
+                DeclarationId(1013),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -56032,10 +56132,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2350, 2366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1997),
+            id: DeclarationId(2001),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(1010),
+                DeclarationId(1013),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -56049,7 +56149,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2371, 2387),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1998),
+            id: DeclarationId(2002),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -56060,7 +56160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(110),
-                        value: DeclarationId(1010),
+                        value: DeclarationId(1013),
                     },
                 ],
             },
@@ -56075,7 +56175,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2632, 2660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1999),
+            id: DeclarationId(2003),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -56086,7 +56186,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(110),
-                        value: DeclarationId(1010),
+                        value: DeclarationId(1013),
                     },
                 ],
             },
@@ -56101,10 +56201,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2704, 2732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2000),
+            id: DeclarationId(2004),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(1018),
+                DeclarationId(1021),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -56118,10 +56218,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5879, 5901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2001),
+            id: DeclarationId(2005),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
-                DeclarationId(1019),
+                DeclarationId(1022),
                 CardinalityBound::AtMostOne,
             )),
             type_params: vec![],
@@ -56135,7 +56235,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6321, 6341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2002),
+            id: DeclarationId(2006),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56149,7 +56249,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 667, 673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2003),
+            id: DeclarationId(2007),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56163,7 +56263,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 678, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2004),
+            id: DeclarationId(2008),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56177,7 +56277,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 696, 710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2005),
+            id: DeclarationId(2009),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56196,7 +56296,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3232, 3258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2006),
+            id: DeclarationId(2010),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56215,7 +56315,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3263, 3291),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2007),
+            id: DeclarationId(2011),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56234,7 +56334,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3296, 3329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2008),
+            id: DeclarationId(2012),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56253,7 +56353,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3334, 3365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2009),
+            id: DeclarationId(2013),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56272,7 +56372,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3370, 3402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2010),
+            id: DeclarationId(2014),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56286,12 +56386,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4409, 4416),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2011),
+            id: DeclarationId(2015),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "previous".to_string(),
-                    ty: DeclarationId(1018),
+                    ty: DeclarationId(1021),
                 }],
             },
             type_params: vec![],
@@ -56305,7 +56405,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4421, 4471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2012),
+            id: DeclarationId(2016),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56319,12 +56419,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4966, 4977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2013),
+            id: DeclarationId(2017),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inner".to_string(),
-                    ty: DeclarationId(1019),
+                    ty: DeclarationId(1022),
                 }],
             },
             type_params: vec![],
@@ -56338,7 +56438,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4982, 5027),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2014),
+            id: DeclarationId(2018),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56357,12 +56457,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7131, 7165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2015),
+            id: DeclarationId(2019),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "amount".to_string(),
-                    ty: DeclarationId(1018),
+                    ty: DeclarationId(1021),
                 }],
             },
             type_params: vec![],
@@ -56376,12 +56476,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7170, 7214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2016),
+            id: DeclarationId(2020),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1018),
+                    ty: DeclarationId(1021),
                 }],
             },
             type_params: vec![],
@@ -56395,12 +56495,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7219, 7277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2017),
+            id: DeclarationId(2021),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "divisor".to_string(),
-                    ty: DeclarationId(1019),
+                    ty: DeclarationId(1022),
                 }],
             },
             type_params: vec![],
@@ -56414,7 +56514,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7282, 7338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2018),
+            id: DeclarationId(2022),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56433,7 +56533,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7343, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2019),
+            id: DeclarationId(2023),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56452,7 +56552,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7381, 7411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2020),
+            id: DeclarationId(2024),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56466,13 +56566,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7416, 7429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2021),
+            id: DeclarationId(2025),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1017),
+                    value: DeclarationId(1020),
                 }],
             },
             type_params: vec![],
@@ -56486,13 +56586,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7469, 7491),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2022),
+            id: DeclarationId(2026),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1010),
+                    value: DeclarationId(1013),
                 }],
             },
             type_params: vec![],
@@ -56506,7 +56606,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7701, 7722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2023),
+            id: DeclarationId(2027),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56520,7 +56620,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2024),
+            id: DeclarationId(2028),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56534,7 +56634,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2025),
+            id: DeclarationId(2029),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56548,7 +56648,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2026),
+            id: DeclarationId(2030),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56562,7 +56662,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2027),
+            id: DeclarationId(2031),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56576,7 +56676,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2028),
+            id: DeclarationId(2032),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56590,7 +56690,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2029),
+            id: DeclarationId(2033),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56604,7 +56704,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 716),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2030),
+            id: DeclarationId(2034),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56618,7 +56718,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 721, 729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2031),
+            id: DeclarationId(2035),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56632,7 +56732,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 734, 742),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2032),
+            id: DeclarationId(2036),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56646,7 +56746,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 747, 754),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2033),
+            id: DeclarationId(2037),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56660,7 +56760,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 759, 765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2034),
+            id: DeclarationId(2038),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56674,7 +56774,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 770, 777),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2035),
+            id: DeclarationId(2039),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56688,7 +56788,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 782, 788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2036),
+            id: DeclarationId(2040),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56702,7 +56802,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 793, 800),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2037),
+            id: DeclarationId(2041),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56721,7 +56821,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 805, 818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2038),
+            id: DeclarationId(2042),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56740,7 +56840,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 823, 834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2039),
+            id: DeclarationId(2043),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56759,7 +56859,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 839, 856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2040),
+            id: DeclarationId(2044),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56773,7 +56873,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 861, 863),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2041),
+            id: DeclarationId(2045),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56787,7 +56887,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 868, 872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2042),
+            id: DeclarationId(2046),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56801,7 +56901,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 877, 882),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2043),
+            id: DeclarationId(2047),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56815,7 +56915,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 887, 889),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2044),
+            id: DeclarationId(2048),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56829,7 +56929,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 894, 896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2045),
+            id: DeclarationId(2049),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56843,7 +56943,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 901, 903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2046),
+            id: DeclarationId(2050),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56857,7 +56957,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 910),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2047),
+            id: DeclarationId(2051),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56871,7 +56971,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 915, 919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2048),
+            id: DeclarationId(2052),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56885,7 +56985,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 924, 929),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2049),
+            id: DeclarationId(2053),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56899,7 +56999,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 934, 938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2050),
+            id: DeclarationId(2054),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56913,7 +57013,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 943, 948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2051),
+            id: DeclarationId(2055),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56927,7 +57027,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 953, 959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2052),
+            id: DeclarationId(2056),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56941,7 +57041,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 964, 972),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2053),
+            id: DeclarationId(2057),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56955,7 +57055,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2054),
+            id: DeclarationId(2058),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56969,7 +57069,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 987, 992),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2055),
+            id: DeclarationId(2059),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56983,7 +57083,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 997, 1005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2056),
+            id: DeclarationId(2060),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56997,7 +57097,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1010, 1019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2057),
+            id: DeclarationId(2061),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57011,7 +57111,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1024, 1027),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2058),
+            id: DeclarationId(2062),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57025,7 +57125,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1032, 1038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2059),
+            id: DeclarationId(2063),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57039,7 +57139,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1043, 1049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2060),
+            id: DeclarationId(2064),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57053,7 +57153,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1054, 1060),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2061),
+            id: DeclarationId(2065),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57067,7 +57167,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1065, 1071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2062),
+            id: DeclarationId(2066),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57081,7 +57181,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1076, 1084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2063),
+            id: DeclarationId(2067),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57095,7 +57195,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1089, 1097),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2064),
+            id: DeclarationId(2068),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57109,7 +57209,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1102, 1107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2065),
+            id: DeclarationId(2069),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57123,7 +57223,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2066),
+            id: DeclarationId(2070),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57137,7 +57237,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1126, 1130),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2067),
+            id: DeclarationId(2071),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57151,7 +57251,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1135, 1143),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2068),
+            id: DeclarationId(2072),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57165,7 +57265,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1148, 1151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2069),
+            id: DeclarationId(2073),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57179,7 +57279,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1722, 1727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2070),
+            id: DeclarationId(2074),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57193,7 +57293,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1732, 1736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2071),
+            id: DeclarationId(2075),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57207,7 +57307,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1741, 1747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2072),
+            id: DeclarationId(2076),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57221,7 +57321,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1752, 1758),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2073),
+            id: DeclarationId(2077),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57235,7 +57335,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1763, 1767),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2074),
+            id: DeclarationId(2078),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57249,7 +57349,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1772, 1778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2075),
+            id: DeclarationId(2079),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57263,7 +57363,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1783, 1792),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2076),
+            id: DeclarationId(2080),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57277,7 +57377,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1797, 1805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2077),
+            id: DeclarationId(2081),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57291,7 +57391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2078),
+            id: DeclarationId(2082),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57305,7 +57405,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1823, 1830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2079),
+            id: DeclarationId(2083),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57319,7 +57419,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1835, 1841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2080),
+            id: DeclarationId(2084),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57333,7 +57433,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1846, 1853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2081),
+            id: DeclarationId(2085),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57347,7 +57447,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1858, 1864),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2082),
+            id: DeclarationId(2086),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57361,7 +57461,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1869, 1876),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2083),
+            id: DeclarationId(2087),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57375,7 +57475,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2316, 2318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2084),
+            id: DeclarationId(2088),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57389,7 +57489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2323, 2327),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2085),
+            id: DeclarationId(2089),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57403,7 +57503,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2332, 2337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2086),
+            id: DeclarationId(2090),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57417,7 +57517,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2342, 2344),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2087),
+            id: DeclarationId(2091),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57431,7 +57531,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2349, 2351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2088),
+            id: DeclarationId(2092),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57445,7 +57545,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2356, 2358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2089),
+            id: DeclarationId(2093),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57459,7 +57559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2363, 2365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2090),
+            id: DeclarationId(2094),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57473,7 +57573,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2370, 2374),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2091),
+            id: DeclarationId(2095),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57487,7 +57587,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2379, 2384),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2092),
+            id: DeclarationId(2096),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57501,7 +57601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2389, 2393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2093),
+            id: DeclarationId(2097),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57515,7 +57615,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2398, 2403),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2094),
+            id: DeclarationId(2098),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57529,7 +57629,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2408, 2414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2095),
+            id: DeclarationId(2099),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57543,7 +57643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2419, 2427),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2096),
+            id: DeclarationId(2100),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57557,7 +57657,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2432, 2437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2097),
+            id: DeclarationId(2101),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57571,7 +57671,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2442, 2447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2098),
+            id: DeclarationId(2102),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57585,7 +57685,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2452, 2460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2099),
+            id: DeclarationId(2103),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57599,7 +57699,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2465, 2474),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2100),
+            id: DeclarationId(2104),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57613,7 +57713,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2479, 2482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2101),
+            id: DeclarationId(2105),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57627,7 +57727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2493),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2102),
+            id: DeclarationId(2106),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57641,7 +57741,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2498, 2504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2103),
+            id: DeclarationId(2107),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57655,7 +57755,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2509, 2515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2104),
+            id: DeclarationId(2108),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57669,7 +57769,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2105),
+            id: DeclarationId(2109),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57683,7 +57783,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2531, 2539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2106),
+            id: DeclarationId(2110),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57697,7 +57797,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2544, 2552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2107),
+            id: DeclarationId(2111),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57711,7 +57811,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2557, 2562),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2108),
+            id: DeclarationId(2112),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57725,7 +57825,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2567, 2576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2109),
+            id: DeclarationId(2113),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57739,7 +57839,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2581, 2585),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2110),
+            id: DeclarationId(2114),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57753,13 +57853,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2590, 2598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2111),
+            id: DeclarationId(2115),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(996),
+                    value: DeclarationId(999),
                 }],
             },
             type_params: vec![],
@@ -57773,13 +57873,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 14633, 14656),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2112),
+            id: DeclarationId(2116),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1050),
+                    value: DeclarationId(1053),
                 }],
             },
             type_params: vec![],
@@ -57793,13 +57893,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 14858, 14873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2113),
+            id: DeclarationId(2117),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1052),
+                    value: DeclarationId(1055),
                 }],
             },
             type_params: vec![],
@@ -57813,7 +57913,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 14878, 14898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2114),
+            id: DeclarationId(2118),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57827,7 +57927,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2480, 2494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2115),
+            id: DeclarationId(2119),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57841,7 +57941,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2499, 2509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2116),
+            id: DeclarationId(2120),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57855,7 +57955,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2514, 2526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2117),
+            id: DeclarationId(2121),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57869,7 +57969,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2531, 2543),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2118),
+            id: DeclarationId(2122),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57883,7 +57983,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2548, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2119),
+            id: DeclarationId(2123),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57897,7 +57997,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2566, 2578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2120),
+            id: DeclarationId(2124),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57911,7 +58011,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2583, 2606),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2121),
+            id: DeclarationId(2125),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57925,7 +58025,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3012, 3021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2122),
+            id: DeclarationId(2126),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57944,7 +58044,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3026, 3042),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2123),
+            id: DeclarationId(2127),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57958,7 +58058,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3701, 3709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2124),
+            id: DeclarationId(2128),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57972,7 +58072,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3714, 3724),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2125),
+            id: DeclarationId(2129),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57986,7 +58086,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4539, 4552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2126),
+            id: DeclarationId(2130),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58000,7 +58100,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4557, 4570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2127),
+            id: DeclarationId(2131),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58014,7 +58114,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4575, 4583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2128),
+            id: DeclarationId(2132),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58028,12 +58128,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4608, 4616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2129),
+            id: DeclarationId(2133),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1044),
+                    ty: DeclarationId(1047),
                 }],
             },
             type_params: vec![],
@@ -58047,7 +58147,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4621, 4661),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2130),
+            id: DeclarationId(2134),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58066,7 +58166,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4666, 4699),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2131),
+            id: DeclarationId(2135),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58076,7 +58176,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "state".to_string(),
-                        ty: DeclarationId(1045),
+                        ty: DeclarationId(1048),
                     },
                 ],
             },
@@ -58091,7 +58191,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4704, 4782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2132),
+            id: DeclarationId(2136),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58110,7 +58210,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4948, 5011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2133),
+            id: DeclarationId(2137),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58139,21 +58239,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5016, 5107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2134),
+            id: DeclarationId(2138),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "input_sample".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "expected_output".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                 ],
             },
@@ -58168,17 +58268,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5112, 5244),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2135),
+            id: DeclarationId(2139),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "invariant".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                 ],
             },
@@ -58193,7 +58293,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5459, 5548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2136),
+            id: DeclarationId(2140),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -58213,7 +58313,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6348, 6360),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2137),
+            id: DeclarationId(2141),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58223,7 +58323,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2136),
+                        ty: DeclarationId(2140),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -58242,7 +58342,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6297, 6394),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2138),
+            id: DeclarationId(2142),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -58262,7 +58362,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 7094, 7106),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2139),
+            id: DeclarationId(2143),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58272,7 +58372,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2138),
+                        ty: DeclarationId(2142),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -58291,21 +58391,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 7044, 7140),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2140),
+            id: DeclarationId(2144),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "lens_ref".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "expected_ref".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                 ],
             },
@@ -58320,21 +58420,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 7438, 7560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2141),
+            id: DeclarationId(2145),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject_ref".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "oracle_ref".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                 ],
             },
@@ -58349,17 +58449,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 7822, 7947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2142),
+            id: DeclarationId(2146),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "left_report_ref".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "right_report_ref".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                 ],
             },
@@ -58374,17 +58474,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 8514, 8626),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2143),
+            id: DeclarationId(2147),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "law".to_string(),
-                        ty: DeclarationId(1046),
+                        ty: DeclarationId(1049),
                     },
                     Field {
                         label: "lens_ref".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                 ],
             },
@@ -58399,17 +58499,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 9222, 9301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2144),
+            id: DeclarationId(2148),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "list_constant".to_string(),
-                        ty: DeclarationId(1035),
+                        ty: DeclarationId(1038),
                     },
                     Field {
                         label: "bound".to_string(),
@@ -58428,21 +58528,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 9521, 9634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2145),
+            id: DeclarationId(2149),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "list_constant".to_string(),
-                        ty: DeclarationId(1035),
+                        ty: DeclarationId(1038),
                     },
                     Field {
                         label: "subset_predicate".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                 ],
             },
@@ -58457,17 +58557,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 9639, 9775),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2146),
+            id: DeclarationId(2150),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "compile_target".to_string(),
-                        ty: DeclarationId(1033),
+                        ty: DeclarationId(1036),
                     },
                     Field {
                         label: "expected".to_string(),
-                        ty: DeclarationId(1034),
+                        ty: DeclarationId(1037),
                     },
                 ],
             },
@@ -58482,17 +58582,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 9780, 9862),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2147),
+            id: DeclarationId(2151),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "ratchet_kind".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                 ],
             },
@@ -58507,13 +58607,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 9867, 9953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2148),
+            id: DeclarationId(2152),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1033),
+                    value: DeclarationId(1036),
                 }],
             },
             type_params: vec![],
@@ -58527,17 +58627,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 10032, 10042),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2149),
+            id: DeclarationId(2153),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "generated_paths".to_string(),
-                        ty: DeclarationId(2148),
+                        ty: DeclarationId(2152),
                     },
                 ],
             },
@@ -58552,21 +58652,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 9958, 10048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2150),
+            id: DeclarationId(2154),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "target_lane".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "authority_doc".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                 ],
             },
@@ -58581,21 +58681,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 10990, 11124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2151),
+            id: DeclarationId(2155),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "target_lane".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                     Field {
                         label: "authority_doc".to_string(),
-                        ty: DeclarationId(1063),
+                        ty: DeclarationId(1066),
                     },
                 ],
             },
@@ -58610,12 +58710,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 11763, 11907),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2152),
+            id: DeclarationId(2156),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ledger".to_string(),
-                    ty: DeclarationId(812),
+                    ty: DeclarationId(815),
                 }],
             },
             type_params: vec![],
@@ -58629,13 +58729,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 12752, 12806),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2153),
+            id: DeclarationId(2157),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(996),
+                    value: DeclarationId(999),
                 }],
             },
             type_params: vec![],
@@ -58649,13 +58749,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 13850, 13873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2154),
+            id: DeclarationId(2158),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1050),
+                    value: DeclarationId(1053),
                 }],
             },
             type_params: vec![],
@@ -58669,13 +58769,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 13919, 13934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2155),
+            id: DeclarationId(2159),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(996),
+                    value: DeclarationId(999),
                 }],
             },
             type_params: vec![],
@@ -58689,7 +58789,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 14190, 14213),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2156),
+            id: DeclarationId(2160),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
@@ -58709,7 +58809,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2157),
+            id: DeclarationId(2161),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58723,7 +58823,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 532, 547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2158),
+            id: DeclarationId(2162),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58737,7 +58837,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 550, 561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2159),
+            id: DeclarationId(2163),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58751,7 +58851,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2160),
+            id: DeclarationId(2164),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(722),
@@ -58768,7 +58868,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2161),
+            id: DeclarationId(2165),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58782,7 +58882,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5552, 5570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2162),
+            id: DeclarationId(2166),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58796,7 +58896,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5575, 5590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2163),
+            id: DeclarationId(2167),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58810,7 +58910,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5619, 5640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2164),
+            id: DeclarationId(2168),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58824,7 +58924,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5645, 5660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2165),
+            id: DeclarationId(2169),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58838,7 +58938,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7257, 7267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2166),
+            id: DeclarationId(2170),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58852,7 +58952,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7272, 7283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2167),
+            id: DeclarationId(2171),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58866,7 +58966,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7288, 7301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2168),
+            id: DeclarationId(2172),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58880,7 +58980,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7306, 7319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2169),
+            id: DeclarationId(2173),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58894,7 +58994,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7324, 7337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2170),
+            id: DeclarationId(2174),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58908,7 +59008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7342, 7356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2171),
+            id: DeclarationId(2175),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58922,7 +59022,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7361, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2172),
+            id: DeclarationId(2176),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58936,7 +59036,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8118, 8135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2173),
+            id: DeclarationId(2177),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58950,7 +59050,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8140, 8150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2174),
+            id: DeclarationId(2178),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58964,7 +59064,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8155, 8159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2175),
+            id: DeclarationId(2179),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58974,11 +59074,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1445),
+                        ty: DeclarationId(1448),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1447),
+                        ty: DeclarationId(1450),
                     },
                     Field {
                         label: "range_min_inclusive".to_string(),
@@ -58994,7 +59094,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "overflow".to_string(),
-                        ty: DeclarationId(1448),
+                        ty: DeclarationId(1451),
                     },
                 ],
             },
@@ -59009,7 +59109,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8937, 9509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2176),
+            id: DeclarationId(2180),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59019,11 +59119,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1446),
+                        ty: DeclarationId(1449),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1447),
+                        ty: DeclarationId(1450),
                     },
                     Field {
                         label: "is_copy".to_string(),
@@ -59042,13 +59142,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9514, 9696),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2177),
+            id: DeclarationId(2181),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(604),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(605),
-                    value: DeclarationId(1449),
+                    value: DeclarationId(1452),
                 }],
             },
             type_params: vec![],
@@ -59176,7 +59276,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(13),
             Port {
                 id: PortId(13),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1671))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1674))),
                 produced_by: Some(NodeId(9)),
             },
         );
@@ -59200,7 +59300,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(16),
             Port {
                 id: PortId(16),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1672))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1675))),
                 produced_by: None,
             },
         );
@@ -59208,7 +59308,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(17),
             Port {
                 id: PortId(17),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1673))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1676))),
                 produced_by: Some(NodeId(11)),
             },
         );
@@ -59496,7 +59596,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(53),
             Port {
                 id: PortId(53),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1674))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1677))),
                 produced_by: None,
             },
         );
@@ -60360,7 +60460,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(161),
             Port {
                 id: PortId(161),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1675))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1678))),
                 produced_by: None,
             },
         );
@@ -60384,7 +60484,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(164),
             Port {
                 id: PortId(164),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1672))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1675))),
                 produced_by: Some(NodeId(113)),
             },
         );
@@ -60400,7 +60500,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(166),
             Port {
                 id: PortId(166),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1676))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1679))),
                 produced_by: Some(NodeId(115)),
             },
         );
@@ -60408,7 +60508,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(167),
             Port {
                 id: PortId(167),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1677))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1680))),
                 produced_by: None,
             },
         );
@@ -60512,7 +60612,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(180),
             Port {
                 id: PortId(180),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1678))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1681))),
                 produced_by: Some(NodeId(128)),
             },
         );
@@ -60656,7 +60756,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(198),
             Port {
                 id: PortId(198),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1679))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1682))),
                 produced_by: None,
             },
         );
@@ -60768,7 +60868,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(212),
             Port {
                 id: PortId(212),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1680))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1683))),
                 produced_by: None,
             },
         );
@@ -60880,7 +60980,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(226),
             Port {
                 id: PortId(226),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1681))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1684))),
                 produced_by: None,
             },
         );
@@ -61496,7 +61596,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(303),
             Port {
                 id: PortId(303),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1682))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1685))),
                 produced_by: None,
             },
         );
@@ -61608,7 +61708,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(317),
             Port {
                 id: PortId(317),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1683))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1686))),
                 produced_by: Some(NodeId(227)),
             },
         );
@@ -61616,7 +61716,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(318),
             Port {
                 id: PortId(318),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1684))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1687))),
                 produced_by: None,
             },
         );
@@ -61672,7 +61772,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(325),
             Port {
                 id: PortId(325),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1685))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1688))),
                 produced_by: Some(NodeId(234)),
             },
         );
@@ -61680,7 +61780,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(326),
             Port {
                 id: PortId(326),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1686))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1689))),
                 produced_by: None,
             },
         );
@@ -61696,7 +61796,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(328),
             Port {
                 id: PortId(328),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1687))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1690))),
                 produced_by: Some(NodeId(237)),
             },
         );
@@ -61712,7 +61812,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(330),
             Port {
                 id: PortId(330),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2156))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2160))),
                 produced_by: Some(NodeId(239)),
             },
         );

From 8b3afba66119f96d4e5b84cc121da3389568b2a6 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gunb.ai>
Date: Sat, 2 May 2026 12:46:25 -0400
Subject: [PATCH 03/18] WIP: keen-swift-519

---
 .../tests/integration/m2_substrate_inhabitance_test.rs    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/v3/compiler/tests/integration/m2_substrate_inhabitance_test.rs b/src/v3/compiler/tests/integration/m2_substrate_inhabitance_test.rs
index 5ba1d2cfea0..08c6ad6a4fd 100644
--- a/src/v3/compiler/tests/integration/m2_substrate_inhabitance_test.rs
+++ b/src/v3/compiler/tests/integration/m2_substrate_inhabitance_test.rs
@@ -2886,12 +2886,12 @@ fn approximate_field_axes_live_in_v3_std_authority() {
 fn approximate_field_carrier_record_shape_ratchets() {
     let dag = v3_compiler::generated_full_bootstrap_dag();
 
-    let approx_id = find_named(dag, "ApproximateField");
+    let approx_id = find_named(&dag, "ApproximateField");
     let field_template = dag
         .declaration_by_name("Field")
         .expect("`Field` must load from dsl/std/algebra.dag");
 
-    let mut labels = record_fields(dag, "ApproximateField");
+    let mut labels = record_fields(&dag, "ApproximateField");
     labels.sort();
     assert_eq!(
         labels,
@@ -2912,7 +2912,7 @@ fn approximate_field_carrier_record_shape_ratchets() {
         "ApproximateField<F> takes exactly one carrier type parameter"
     );
 
-    let base_ty = conj_field_by_id(dag, approx_id, "base");
+    let base_ty = conj_field_by_id(&dag, approx_id, "base");
     match &dag.declaration(base_ty).connective {
         TypeConnective::Instantiation {
             template,
@@ -2935,7 +2935,7 @@ fn approximate_field_carrier_record_shape_ratchets() {
         other => panic!("`base` must lower to a Field instantiation; got {other:?}"),
     }
 
-    let mut sv_labels = record_fields(dag, "SpecialValues");
+    let mut sv_labels = record_fields(&dag, "SpecialValues");
     sv_labels.sort();
     assert_eq!(
         sv_labels,

From 917f3056785a979e0bc4941dc3fe8726853d6a6c Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gunb.ai>
Date: Sat, 2 May 2026 13:05:40 -0400
Subject: [PATCH 04/18] WIP: keen-swift-519

---
 .../integration/m2_substrate_inhabitance_test.rs      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/v3/compiler/tests/integration/m2_substrate_inhabitance_test.rs b/src/v3/compiler/tests/integration/m2_substrate_inhabitance_test.rs
index 08c6ad6a4fd..85754fa7a47 100644
--- a/src/v3/compiler/tests/integration/m2_substrate_inhabitance_test.rs
+++ b/src/v3/compiler/tests/integration/m2_substrate_inhabitance_test.rs
@@ -2928,8 +2928,15 @@ fn approximate_field_carrier_record_shape_ratchets() {
                 "`Field<F>` carries exactly one type argument"
             );
             assert_eq!(
-                arguments[0].parameter, approx_decl.type_params[0],
-                "`Field`'s argument must bind `ApproximateField`'s `<F>` carrier parameter"
+                arguments[0].parameter,
+                field_template.type_params[0],
+                "`Field` instantiation must fill `Field`'s formal `<T>` slot"
+            );
+            assert_eq!(
+                arguments[0].value,
+                approx_decl.type_params[0],
+                "`base: Field<F>` must pass ApproximateField's carrier `<F>` as the `Field` argument \
+                 (parameter = template slot; value = argument binding)"
             );
         }
         other => panic!("`base` must lower to a Field instantiation; got {other:?}"),

From ceca2ab1ac939581ad43a20b670b9f212451b48f Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gunb.ai>
Date: Sat, 2 May 2026 13:06:13 -0400
Subject: [PATCH 05/18] chore: apply cargo fmt

---
 .../tests/integration/m2_substrate_inhabitance_test.rs         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/v3/compiler/tests/integration/m2_substrate_inhabitance_test.rs b/src/v3/compiler/tests/integration/m2_substrate_inhabitance_test.rs
index 85754fa7a47..c2e918d13f2 100644
--- a/src/v3/compiler/tests/integration/m2_substrate_inhabitance_test.rs
+++ b/src/v3/compiler/tests/integration/m2_substrate_inhabitance_test.rs
@@ -2928,8 +2928,7 @@ fn approximate_field_carrier_record_shape_ratchets() {
                 "`Field<F>` carries exactly one type argument"
             );
             assert_eq!(
-                arguments[0].parameter,
-                field_template.type_params[0],
+                arguments[0].parameter, field_template.type_params[0],
                 "`Field` instantiation must fill `Field`'s formal `<T>` slot"
             );
             assert_eq!(

From 6eeee7d949c8eab96cc884a4e86a4b8f4e2e6469 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gunb.ai>
Date: Sat, 2 May 2026 14:33:51 -0400
Subject: [PATCH 06/18] WIP: keen-swift-519

---
 src/v3/compiler/tests/integration/parse_corpus_manifest.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/v3/compiler/tests/integration/parse_corpus_manifest.txt b/src/v3/compiler/tests/integration/parse_corpus_manifest.txt
index 5b070364444..8edb415cc31 100644
--- a/src/v3/compiler/tests/integration/parse_corpus_manifest.txt
+++ b/src/v3/compiler/tests/integration/parse_corpus_manifest.txt
@@ -28,7 +28,7 @@ src/v3/std/algebra.dag	42	303630	8be5b86cc9520bc3
 src/v3/std/anthropic_messages.dag	5	6056	25140dcf6faa8e6b
 src/v3/std/anthropic_operations.dag	6	3404	a729e7662be9af5f
 src/v3/std/anthropic_schema.dag	8	20682	cdd44a074743988b
-src/v3/std/approximate_field.dag	8	12060	00e7a73af637c429
+src/v3/std/approximate_field.dag	11	16862	9418b4b55ac41cf3
 src/v3/std/bin_shim.dag	4	2544	9ac96f1b3feafe47
 src/v3/std/bridge_ledger.dag	7	31662	ec3b4ea8c0455eb7
 src/v3/std/clean_emission.dag	15	23867	e7bc1e6145f4781e

From 6c19aa12371c559a5e4f5769282128a992a31065 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gunb.ai>
Date: Sat, 2 May 2026 17:16:37 -0400
Subject: [PATCH 07/18] WIP: keen-swift-519

---
 src/v3/compiler/src/bootstrap_generated.rs    | 36 +++++++++----------
 ...otstrap_generated_without_parse_surface.rs | 36 +++++++++----------
 src/v3/std/approximate_field.dag              | 17 ++++-----
 3 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs
index 41134e2e077..e647ea9b2a1 100644
--- a/src/v3/compiler/src/bootstrap_generated.rs
+++ b/src/v3/compiler/src/bootstrap_generated.rs
@@ -20704,7 +20704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1929, 1985),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1967, 2023),
         });
         declarations.push(Declaration {
             id: DeclarationId(807),
@@ -20729,7 +20729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2175, 2224),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2251, 2300),
         });
         declarations.push(Declaration {
             id: DeclarationId(808),
@@ -20754,7 +20754,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2417, 2466),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2531, 2580),
         });
         declarations.push(Declaration {
             id: DeclarationId(809),
@@ -20783,7 +20783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2663, 2731),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2875, 2943),
         });
         declarations.push(Declaration {
             id: DeclarationId(810),
@@ -20812,7 +20812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3007, 3105),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3219, 3317),
         });
         declarations.push(Declaration {
             id: DeclarationId(811),
@@ -20849,7 +20849,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3341, 3502),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3553, 3714),
         });
         declarations.push(Declaration {
             id: DeclarationId(812),
@@ -20863,7 +20863,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3341, 3502),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3553, 3714),
         });
         declarations.push(Declaration {
             id: DeclarationId(813),
@@ -54622,7 +54622,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1946, 1951),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1984, 1989),
         });
         declarations.push(Declaration {
             id: DeclarationId(1781),
@@ -54636,7 +54636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1954, 1962),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1992, 2000),
         });
         declarations.push(Declaration {
             id: DeclarationId(1782),
@@ -54650,7 +54650,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1965, 1985),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2003, 2023),
         });
         declarations.push(Declaration {
             id: DeclarationId(1783),
@@ -54664,7 +54664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2197, 2207),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2273, 2283),
         });
         declarations.push(Declaration {
             id: DeclarationId(1784),
@@ -54678,7 +54678,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2210, 2224),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2286, 2300),
         });
         declarations.push(Declaration {
             id: DeclarationId(1785),
@@ -54692,7 +54692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2441, 2453),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2555, 2567),
         });
         declarations.push(Declaration {
             id: DeclarationId(1786),
@@ -54706,7 +54706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2456, 2466),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2570, 2580),
         });
         declarations.push(Declaration {
             id: DeclarationId(1787),
@@ -54720,7 +54720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2686, 2698),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2898, 2910),
         });
         declarations.push(Declaration {
             id: DeclarationId(1788),
@@ -54734,7 +54734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2701, 2717),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2913, 2929),
         });
         declarations.push(Declaration {
             id: DeclarationId(1789),
@@ -54748,7 +54748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2720, 2731),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2932, 2943),
         });
         declarations.push(Declaration {
             id: DeclarationId(1790),
@@ -54768,7 +54768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3376, 3384),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3588, 3596),
         });
         declarations.push(Declaration {
             id: DeclarationId(1791),
diff --git a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
index 7331fc44837..b3c4c1764c7 100644
--- a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
+++ b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
@@ -20704,7 +20704,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1929, 1985),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1967, 2023),
         });
         declarations.push(Declaration {
             id: DeclarationId(807),
@@ -20729,7 +20729,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2175, 2224),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2251, 2300),
         });
         declarations.push(Declaration {
             id: DeclarationId(808),
@@ -20754,7 +20754,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2417, 2466),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2531, 2580),
         });
         declarations.push(Declaration {
             id: DeclarationId(809),
@@ -20783,7 +20783,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2663, 2731),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2875, 2943),
         });
         declarations.push(Declaration {
             id: DeclarationId(810),
@@ -20812,7 +20812,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3007, 3105),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3219, 3317),
         });
         declarations.push(Declaration {
             id: DeclarationId(811),
@@ -20849,7 +20849,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3341, 3502),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3553, 3714),
         });
         declarations.push(Declaration {
             id: DeclarationId(812),
@@ -20863,7 +20863,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3341, 3502),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3553, 3714),
         });
         declarations.push(Declaration {
             id: DeclarationId(813),
@@ -52045,7 +52045,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1946, 1951),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1984, 1989),
         });
         declarations.push(Declaration {
             id: DeclarationId(1766),
@@ -52059,7 +52059,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1954, 1962),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1992, 2000),
         });
         declarations.push(Declaration {
             id: DeclarationId(1767),
@@ -52073,7 +52073,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 1965, 1985),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2003, 2023),
         });
         declarations.push(Declaration {
             id: DeclarationId(1768),
@@ -52087,7 +52087,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2197, 2207),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2273, 2283),
         });
         declarations.push(Declaration {
             id: DeclarationId(1769),
@@ -52101,7 +52101,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2210, 2224),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2286, 2300),
         });
         declarations.push(Declaration {
             id: DeclarationId(1770),
@@ -52115,7 +52115,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2441, 2453),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2555, 2567),
         });
         declarations.push(Declaration {
             id: DeclarationId(1771),
@@ -52129,7 +52129,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2456, 2466),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2570, 2580),
         });
         declarations.push(Declaration {
             id: DeclarationId(1772),
@@ -52143,7 +52143,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2686, 2698),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2898, 2910),
         });
         declarations.push(Declaration {
             id: DeclarationId(1773),
@@ -52157,7 +52157,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2701, 2717),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2913, 2929),
         });
         declarations.push(Declaration {
             id: DeclarationId(1774),
@@ -52171,7 +52171,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2720, 2731),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 2932, 2943),
         });
         declarations.push(Declaration {
             id: DeclarationId(1775),
@@ -52191,7 +52191,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3376, 3384),
+            span: SourceSpan::new("src/v3/std/approximate_field.dag", 3588, 3596),
         });
         declarations.push(Declaration {
             id: DeclarationId(1776),
diff --git a/src/v3/std/approximate_field.dag b/src/v3/std/approximate_field.dag
index efeec09c38b..bdb4de87ca5 100644
--- a/src/v3/std/approximate_field.dag
+++ b/src/v3/std/approximate_field.dag
@@ -38,23 +38,24 @@ type Precision
   | DecimalPrecision { digits: PositiveInt, exponent_digits: PositiveInt }
 
 // 🟢 TERMINAL at special-value policy scope. NaN support is an independent
-// closed policy axis; the later carrier slice can aggregate it without adding
-// new policy vocabulary.
+// closed policy axis; `ApproximateField<F>` aggregates it through `SpecialValues`
+// without adding policy vocabulary beyond these terminals.
 type NanPolicy = NoNaN | QuietNaN | QuietAndSignalingNaN
 
 // 🟢 TERMINAL at special-value policy scope. Infinity support is an independent
-// closed policy axis; the later carrier slice can aggregate it without adding
-// new policy vocabulary.
+// closed policy axis; `ApproximateField<F>` aggregates it through `SpecialValues`
+// without adding policy vocabulary beyond these terminals.
 type InfinityPolicy = NoInfinity | SignedInfinity
 
 // 🟢 TERMINAL at special-value policy scope. Signed-zero support is an
-// independent closed policy axis; the later carrier slice can aggregate it
-// without adding new policy vocabulary.
+// independent closed policy axis; `ApproximateField<F>` aggregates it through
+// `SpecialValues` without adding policy vocabulary beyond these terminals.
 type SignedZeroPolicy = NoSignedZero | SignedZero
 
 // 🟢 TERMINAL at subnormal/denormal policy scope. Underflow behavior is an
-// independent closed policy axis; the later carrier slice can aggregate it
-// without adding new policy vocabulary.
+// independent closed policy axis; `ApproximateField<F>` carries it as
+// `subnormal_policy` — separate from `SpecialValues` per 6Q (denormal policy
+// is underflow semantics, not merely “admits subnormals”).
 type SubnormalPolicy = NoSubnormals | GradualUnderflow | FlushToZero
 
 // Closed record aggregating the three orthogonal special-value policy axes (NaN,

From 9f8db0b908cfd05037c0813d59191ebfc5866ea2 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gunb.ai>
Date: Sat, 2 May 2026 21:19:02 +0000
Subject: [PATCH 08/18] chore(v3-compiler): refresh SG-2 manifest hash for
 approximate_field.dag
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

OpenAI approve-with-comments noted stale policy-axis wording vs landed carrier;
those comments are already present-tense on this branch. The parse corpus row’s
fnv1a64 still lagged render_manifest() output — refresh fixes SG-2 parity.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/v3/compiler/tests/integration/parse_corpus_manifest.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/v3/compiler/tests/integration/parse_corpus_manifest.txt b/src/v3/compiler/tests/integration/parse_corpus_manifest.txt
index 8edb415cc31..c3b876bc165 100644
--- a/src/v3/compiler/tests/integration/parse_corpus_manifest.txt
+++ b/src/v3/compiler/tests/integration/parse_corpus_manifest.txt
@@ -28,7 +28,7 @@ src/v3/std/algebra.dag	42	303630	8be5b86cc9520bc3
 src/v3/std/anthropic_messages.dag	5	6056	25140dcf6faa8e6b
 src/v3/std/anthropic_operations.dag	6	3404	a729e7662be9af5f
 src/v3/std/anthropic_schema.dag	8	20682	cdd44a074743988b
-src/v3/std/approximate_field.dag	11	16862	9418b4b55ac41cf3
+src/v3/std/approximate_field.dag	11	16862	d3bf5c7f2f410ce1
 src/v3/std/bin_shim.dag	4	2544	9ac96f1b3feafe47
 src/v3/std/bridge_ledger.dag	7	31662	ec3b4ea8c0455eb7
 src/v3/std/clean_emission.dag	15	23867	e7bc1e6145f4781e

From fb04211ac07ad98bae019d1707021eab7e45c853 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gunb.ai>
Date: Mon, 4 May 2026 13:35:35 -0400
Subject: [PATCH 09/18] WIP: keen-swift-519

---
 src/v3/compiler/src/diagnostics.rs            | 20 +++++++++
 src/v3/compiler/src/lib.rs                    |  2 +-
 .../lens_substrate_carrier_test.rs            | 42 ++++++++++---------
 .../integration/m1_5_verification_test.rs     |  5 ++-
 src/v3/std/diagnostics.dag                    |  5 ++-
 src/v3/std/verification.dag                   |  5 ++-
 6 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/src/v3/compiler/src/diagnostics.rs b/src/v3/compiler/src/diagnostics.rs
index 76d44162e34..c24b8d8929b 100644
--- a/src/v3/compiler/src/diagnostics.rs
+++ b/src/v3/compiler/src/diagnostics.rs
@@ -220,6 +220,26 @@ pub enum Diagnostic {
     },
 }
 
+/// Layer-1 compiler diagnostic kind labels in **declaration order** of [`Diagnostic`].
+///
+/// `src/v3/std/diagnostics.dag` `CompilerDiagnosticKind` and `src/v3/std/verification.dag`
+/// `DiagnosticKind` must carry exactly this set (integration tests ratchet the bootstrap
+/// lowering against this slice). When adding a [`Diagnostic`] variant, extend this list in
+/// lock-step and update the `.dag` closed sums — lens-instance kinds stay on the Layer-2 path
+/// (Q6.5), not here.
+pub const LAYER1_DIAGNOSTIC_KIND_LABELS: &[&str] = &[
+    "TokenizerError",
+    "ParseError",
+    "TypeMismatch",
+    "ArityMismatch",
+    "ResolveError",
+    "UnitMismatch",
+    "BranchConditionNotBool",
+    "MagnitudeOutOfRange",
+    "MalformedIntegerRangeFact",
+    "NominalOpacityViolation",
+];
+
 impl Diagnostic {
     pub fn span(&self) -> &SourceSpan {
         match self {
diff --git a/src/v3/compiler/src/lib.rs b/src/v3/compiler/src/lib.rs
index 5d558688b86..f9a2d7a12ef 100644
--- a/src/v3/compiler/src/lib.rs
+++ b/src/v3/compiler/src/lib.rs
@@ -3365,7 +3365,7 @@ pub(crate) mod workflow_idempotency;
 pub(crate) mod workflow_parallelism;
 
 pub use dag::{Dag, NodeId};
-pub use diagnostics::{Diagnostic, SourceSpan};
+pub use diagnostics::{Diagnostic, LAYER1_DIAGNOSTIC_KIND_LABELS, SourceSpan};
 pub use emit::{EmitDispatchError, EmitMode, EmitTarget, EmittedSource};
 pub use emit_rust::EmitError;
 /// Lane 2 Stage 2b — supported public surface: [`analyze_workflow`] is the
diff --git a/src/v3/compiler/tests/integration/lens_substrate_carrier_test.rs b/src/v3/compiler/tests/integration/lens_substrate_carrier_test.rs
index 7fadca817c5..8e6588430b4 100644
--- a/src/v3/compiler/tests/integration/lens_substrate_carrier_test.rs
+++ b/src/v3/compiler/tests/integration/lens_substrate_carrier_test.rs
@@ -8,7 +8,8 @@
 //!   shape (`name`, `read`, `sequential: Monoid<C>`, `branch`, `iterate`,
 //!   `validate`).
 //! - `Diagnostic.kind` widens from `CompilerDiagnosticKind` to
-//!   `AnyDiagnosticKind`; the Layer-1 closed sum stays unchanged.
+//!   `AnyDiagnosticKind`; the Layer-1 closed sum tracks the compiler's
+//!   native `Diagnostic` taxonomy, ratcheted via `LAYER1_DIAGNOSTIC_KIND_LABELS`.
 //! - `LensInstanceKindWitness` is decl-only (no payload value field)
 //!   until refinement/dependent typing lands; this is the explicit
 //!   substrate gap receipt.
@@ -17,7 +18,7 @@ use std::collections::HashSet;
 
 use crate::common::cached_compile_to_dag;
 use v3_compiler::dag::{ArrowBody, Dag, DeclarationId, TypeConnective};
-use v3_compiler::generated_full_bootstrap_dag;
+use v3_compiler::{generated_full_bootstrap_dag, LAYER1_DIAGNOSTIC_KIND_LABELS};
 
 fn conj_field_labels(dag: &Dag, name: &str) -> Vec<String> {
     let decl = dag
@@ -123,28 +124,29 @@ fn diagnostic_kind_widened_to_any_diagnostic_kind() {
 }
 
 #[test]
-fn compiler_diagnostic_kind_closed_sum_unchanged() {
+fn compiler_diagnostic_kind_matches_rust_layer1_authority() {
     let dag = generated_full_bootstrap_dag();
-    let variants: HashSet<String> = disj_variant_labels(&dag, "CompilerDiagnosticKind")
+    let substrate: HashSet<String> = disj_variant_labels(&dag, "CompilerDiagnosticKind")
         .into_iter()
         .collect();
-    let expected: HashSet<&str> = [
-        "TokenizerError",
-        "ParseError",
-        "TypeMismatch",
-        "UnitMismatch",
-        "ArityMismatch",
-        "ResolveError",
-        "NominalOpacityViolation",
-    ]
-    .into_iter()
-    .collect();
-    let actual: HashSet<&str> = variants.iter().map(String::as_str).collect();
+    let rust: HashSet<&str> = LAYER1_DIAGNOSTIC_KIND_LABELS.iter().copied().collect();
+    let actual: HashSet<&str> = substrate.iter().map(String::as_str).collect();
     assert_eq!(
-        actual, expected,
-        "CompilerDiagnosticKind closed sum changed — Layer-1 must stay locked; \
-         lens-instance kinds enter via Layer-2 LensInstanceKindWitness, NOT \
-         by extending this sum (anti-bridge invariant per Q6.5)"
+        actual, rust,
+        "CompilerDiagnosticKind must match `LAYER1_DIAGNOSTIC_KIND_LABELS` / `Diagnostic` in \
+         diagnostics.rs; lens-instance kinds use Layer-2 LensInstanceKindWitness (Q6.5 anti-bridge)"
+    );
+}
+
+#[test]
+fn verification_diagnostic_kind_mirrors_compiler_diagnostic_kind() {
+    let dag = generated_full_bootstrap_dag();
+    let compiler = disj_variant_labels(&dag, "CompilerDiagnosticKind");
+    let verification = disj_variant_labels(&dag, "DiagnosticKind");
+    assert_eq!(
+        compiler, verification,
+        "std.verification.DiagnosticKind must mirror std.diagnostics.CompilerDiagnosticKind \
+         (variant labels and order)"
     );
 }
 
diff --git a/src/v3/compiler/tests/integration/m1_5_verification_test.rs b/src/v3/compiler/tests/integration/m1_5_verification_test.rs
index 6610dd0b518..10739380a20 100644
--- a/src/v3/compiler/tests/integration/m1_5_verification_test.rs
+++ b/src/v3/compiler/tests/integration/m1_5_verification_test.rs
@@ -89,9 +89,12 @@ fn bootstrap_loads_verification_authority_types() {
             (String::from("TokenizerError"), Vec::new()),
             (String::from("ParseError"), Vec::new()),
             (String::from("TypeMismatch"), Vec::new()),
-            (String::from("UnitMismatch"), Vec::new()),
             (String::from("ArityMismatch"), Vec::new()),
             (String::from("ResolveError"), Vec::new()),
+            (String::from("UnitMismatch"), Vec::new()),
+            (String::from("BranchConditionNotBool"), Vec::new()),
+            (String::from("MagnitudeOutOfRange"), Vec::new()),
+            (String::from("MalformedIntegerRangeFact"), Vec::new()),
             (String::from("NominalOpacityViolation"), Vec::new()),
         ]
     );
diff --git a/src/v3/std/diagnostics.dag b/src/v3/std/diagnostics.dag
index bf62d0383e7..810b93d5c75 100644
--- a/src/v3/std/diagnostics.dag
+++ b/src/v3/std/diagnostics.dag
@@ -22,9 +22,12 @@ type CompilerDiagnosticKind
   = TokenizerError
   | ParseError
   | TypeMismatch
-  | UnitMismatch
   | ArityMismatch
   | ResolveError
+  | UnitMismatch
+  | BranchConditionNotBool
+  | MagnitudeOutOfRange
+  | MalformedIntegerRangeFact
   | NominalOpacityViolation
 
 // 🟢 TERMINAL for DB-1's source-level correction carrier. Corrections
diff --git a/src/v3/std/verification.dag b/src/v3/std/verification.dag
index b61a882ae61..57f6ea9cd18 100644
--- a/src/v3/std/verification.dag
+++ b/src/v3/std/verification.dag
@@ -56,9 +56,12 @@ type DiagnosticKind
   = TokenizerError
   | ParseError
   | TypeMismatch
-  | UnitMismatch
   | ArityMismatch
   | ResolveError
+  | UnitMismatch
+  | BranchConditionNotBool
+  | MagnitudeOutOfRange
+  | MalformedIntegerRangeFact
   | NominalOpacityViolation
 
 // **🟡 Scaffold — DiagnosticDetailExpectation.** Bootstrap-local bridge

From 95821771f133e89ab284f9d55a2859f258677874 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gunb.ai>
Date: Mon, 4 May 2026 13:35:42 -0400
Subject: [PATCH 10/18] chore: apply cargo fmt

---
 src/v3/compiler/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/v3/compiler/src/lib.rs b/src/v3/compiler/src/lib.rs
index f9a2d7a12ef..c4a2e7008e5 100644
--- a/src/v3/compiler/src/lib.rs
+++ b/src/v3/compiler/src/lib.rs
@@ -3365,7 +3365,7 @@ pub(crate) mod workflow_idempotency;
 pub(crate) mod workflow_parallelism;
 
 pub use dag::{Dag, NodeId};
-pub use diagnostics::{Diagnostic, LAYER1_DIAGNOSTIC_KIND_LABELS, SourceSpan};
+pub use diagnostics::{Diagnostic, SourceSpan, LAYER1_DIAGNOSTIC_KIND_LABELS};
 pub use emit::{EmitDispatchError, EmitMode, EmitTarget, EmittedSource};
 pub use emit_rust::EmitError;
 /// Lane 2 Stage 2b — supported public surface: [`analyze_workflow`] is the

From 8a7a6f0f31fd43364941015d426aaad09fa580c1 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gunb.ai>
Date: Mon, 4 May 2026 13:38:47 -0400
Subject: [PATCH 11/18] WIP: keen-swift-519

---
 src/v3/compiler/src/bootstrap_generated.rs    | 2732 +++++++++--------
 ...otstrap_generated_without_parse_surface.rs | 2328 +++++++-------
 2 files changed, 2638 insertions(+), 2422 deletions(-)

diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs
index d4bda3806e2..09e8a426165 100644
--- a/src/v3/compiler/src/bootstrap_generated.rs
+++ b/src/v3/compiler/src/bootstrap_generated.rs
@@ -8,7 +8,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag {
         ports: bootstrapped_fixture_dag_ports(),
         diagnostics: bootstrapped_fixture_dag_diagnostics(),
         next_node_id: 315,
-        next_declaration_id: 2317,
+        next_declaration_id: 2323,
         next_port_id: 420,
         primitives: PrimitiveCache::default(),
         substrate_markers: SubstrateMarkers::default(),
@@ -23,7 +23,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag {
         callable_strategy_variants: CallableStrategyVariants::default(),
         clusters: bootstrapped_fixture_dag_clusters(),
         optional_match_disjs: bootstrapped_fixture_dag_optional_match_disjs(),
-        declaration_append_begin_after_bootstrap: 2317,
+        declaration_append_begin_after_bootstrap: 2323,
     }
 }
 
@@ -4126,7 +4126,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
 #[allow(clippy::vec_init_then_push)]
 fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
     {
-        let mut declarations = Vec::with_capacity(2317);
+        let mut declarations = Vec::with_capacity(2323);
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -23347,21 +23347,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         ty: DeclarationId(1922),
                     },
                     Field {
-                        label: "UnitMismatch".to_string(),
+                        label: "ArityMismatch".to_string(),
                         ty: DeclarationId(1923),
                     },
                     Field {
-                        label: "ArityMismatch".to_string(),
+                        label: "ResolveError".to_string(),
                         ty: DeclarationId(1924),
                     },
                     Field {
-                        label: "ResolveError".to_string(),
+                        label: "UnitMismatch".to_string(),
                         ty: DeclarationId(1925),
                     },
                     Field {
-                        label: "NominalOpacityViolation".to_string(),
+                        label: "BranchConditionNotBool".to_string(),
                         ty: DeclarationId(1926),
                     },
+                    Field {
+                        label: "MagnitudeOutOfRange".to_string(),
+                        ty: DeclarationId(1927),
+                    },
+                    Field {
+                        label: "MalformedIntegerRangeFact".to_string(),
+                        ty: DeclarationId(1928),
+                    },
+                    Field {
+                        label: "NominalOpacityViolation".to_string(),
+                        ty: DeclarationId(1929),
+                    },
                 ],
             },
             type_params: vec![],
@@ -23372,7 +23384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 990, 1148),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 990, 1229),
         });
         declarations.push(Declaration {
             id: DeclarationId(873),
@@ -23401,7 +23413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1354, 1607),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1435, 1688),
         });
         declarations.push(Declaration {
             id: DeclarationId(874),
@@ -23426,7 +23438,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 2387, 2450),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 2468, 2531),
         });
         declarations.push(Declaration {
             id: DeclarationId(875),
@@ -23445,7 +23457,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 4652, 4712),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 4733, 4793),
         });
         declarations.push(Declaration {
             id: DeclarationId(876),
@@ -23454,11 +23466,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CompilerKind".to_string(),
-                        ty: DeclarationId(1927),
+                        ty: DeclarationId(1930),
                     },
                     Field {
                         label: "LensInstanceKind".to_string(),
-                        ty: DeclarationId(1928),
+                        ty: DeclarationId(1931),
                     },
                 ],
             },
@@ -23470,7 +23482,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5321, 5430),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5402, 5511),
         });
         declarations.push(Declaration {
             id: DeclarationId(877),
@@ -23491,7 +23503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fixes".to_string(),
-                        ty: DeclarationId(1929),
+                        ty: DeclarationId(1932),
                     },
                 ],
             },
@@ -23503,7 +23515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5799, 5907),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5880, 5988),
         });
         declarations.push(Declaration {
             id: DeclarationId(878),
@@ -23512,31 +23524,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UnderRefined".to_string(),
-                        ty: DeclarationId(1930),
+                        ty: DeclarationId(1933),
                     },
                     Field {
                         label: "NoInhabitant".to_string(),
-                        ty: DeclarationId(1931),
+                        ty: DeclarationId(1934),
                     },
                     Field {
                         label: "ContradictoryUse".to_string(),
-                        ty: DeclarationId(1933),
+                        ty: DeclarationId(1936),
                     },
                     Field {
                         label: "OutOfR2Scope".to_string(),
-                        ty: DeclarationId(1934),
+                        ty: DeclarationId(1937),
                     },
                     Field {
                         label: "LifetimeProgramExtractionPending".to_string(),
-                        ty: DeclarationId(1935),
+                        ty: DeclarationId(1938),
                     },
                     Field {
                         label: "FoldNotImplemented".to_string(),
-                        ty: DeclarationId(1936),
+                        ty: DeclarationId(1939),
                     },
                     Field {
                         label: "MissingEmissionPath".to_string(),
-                        ty: DeclarationId(1937),
+                        ty: DeclarationId(1940),
                     },
                 ],
             },
@@ -23548,7 +23560,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 8541, 11258),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 8622, 11339),
         });
         declarations.push(Declaration {
             id: DeclarationId(879),
@@ -23557,11 +23569,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Inhabits".to_string(),
-                        ty: DeclarationId(1952),
+                        ty: DeclarationId(1955),
                     },
                     Field {
                         label: "Violates".to_string(),
-                        ty: DeclarationId(1953),
+                        ty: DeclarationId(1956),
                     },
                 ],
             },
@@ -23596,11 +23608,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoDiagnostic".to_string(),
-                        ty: DeclarationId(1954),
+                        ty: DeclarationId(1957),
                     },
                     Field {
                         label: "SomeDiagnostic".to_string(),
-                        ty: DeclarationId(1955),
+                        ty: DeclarationId(1958),
                     },
                 ],
             },
@@ -23621,11 +23633,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DimensionOk".to_string(),
-                        ty: DeclarationId(1958),
+                        ty: DeclarationId(1961),
                     },
                     Field {
                         label: "DimensionFail".to_string(),
-                        ty: DeclarationId(1962),
+                        ty: DeclarationId(1965),
                     },
                 ],
             },
@@ -23664,15 +23676,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "witness_of".to_string(),
-                        ty: DeclarationId(1964),
+                        ty: DeclarationId(1967),
                     },
                     Field {
                         label: "compose".to_string(),
-                        ty: DeclarationId(1965),
+                        ty: DeclarationId(1968),
                     },
                     Field {
                         label: "break_diagnostic".to_string(),
-                        ty: DeclarationId(1966),
+                        ty: DeclarationId(1969),
                     },
                 ],
             },
@@ -23712,7 +23724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             type_params: vec![DeclarationId(887), DeclarationId(888)],
             phantom_params: vec![PhantomParameter {
                 parameter: DeclarationId(887),
-                algebra: DeclarationId(1967),
+                algebra: DeclarationId(1970),
             }],
             meta_tag: None,
             specialization_parent: None,
@@ -23853,11 +23865,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("add_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1938),
-                    DeclarationId(1939),
-                    DeclarationId(1940),
+                    DeclarationId(1941),
+                    DeclarationId(1942),
+                    DeclarationId(1943),
                 ],
-                output: DeclarationId(1941),
+                output: DeclarationId(1944),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)),
             },
             type_params: vec![DeclarationId(897), DeclarationId(898)],
@@ -23903,11 +23915,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("sub_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1942),
-                    DeclarationId(1943),
-                    DeclarationId(1944),
+                    DeclarationId(1945),
+                    DeclarationId(1946),
+                    DeclarationId(1947),
                 ],
-                output: DeclarationId(1945),
+                output: DeclarationId(1948),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)),
             },
             type_params: vec![DeclarationId(900), DeclarationId(901)],
@@ -23952,8 +23964,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(902),
             name: Some("mul_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1946), DeclarationId(1947), DeclarationId(904)],
-                output: DeclarationId(1948),
+                inputs: vec![DeclarationId(1949), DeclarationId(1950), DeclarationId(904)],
+                output: DeclarationId(1951),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)),
             },
             type_params: vec![DeclarationId(903), DeclarationId(904)],
@@ -23998,8 +24010,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(905),
             name: Some("div_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1949), DeclarationId(1950), DeclarationId(907)],
-                output: DeclarationId(1951),
+                inputs: vec![DeclarationId(1952), DeclarationId(1953), DeclarationId(907)],
+                output: DeclarationId(1954),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)),
             },
             type_params: vec![DeclarationId(906), DeclarationId(907)],
@@ -24063,7 +24075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(1968),
+                        ty: DeclarationId(1971),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -24125,11 +24137,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BoundUnspecified".to_string(),
-                        ty: DeclarationId(1969),
+                        ty: DeclarationId(1972),
                     },
                     Field {
                         label: "StaticBoundFact".to_string(),
-                        ty: DeclarationId(1970),
+                        ty: DeclarationId(1973),
                     },
                 ],
             },
@@ -24179,11 +24191,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DirectField".to_string(),
-                        ty: DeclarationId(1971),
+                        ty: DeclarationId(1974),
                     },
                     Field {
                         label: "AccessorMethod".to_string(),
-                        ty: DeclarationId(1972),
+                        ty: DeclarationId(1975),
                     },
                 ],
             },
@@ -24286,7 +24298,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "parameters".to_string(),
-                        ty: DeclarationId(1973),
+                        ty: DeclarationId(1976),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -24336,11 +24348,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(1974),
+                        ty: DeclarationId(1977),
                     },
                     Field {
                         label: "Consumed".to_string(),
-                        ty: DeclarationId(1975),
+                        ty: DeclarationId(1978),
                     },
                 ],
             },
@@ -24361,11 +24373,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Owned".to_string(),
-                        ty: DeclarationId(1976),
+                        ty: DeclarationId(1979),
                     },
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(1977),
+                        ty: DeclarationId(1980),
                     },
                 ],
             },
@@ -24386,11 +24398,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SelfContained".to_string(),
-                        ty: DeclarationId(1978),
+                        ty: DeclarationId(1981),
                     },
                     Field {
                         label: "Caller".to_string(),
-                        ty: DeclarationId(1979),
+                        ty: DeclarationId(1982),
                     },
                 ],
             },
@@ -24411,15 +24423,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Growable".to_string(),
-                        ty: DeclarationId(1980),
+                        ty: DeclarationId(1983),
                     },
                     Field {
                         label: "Fixed".to_string(),
-                        ty: DeclarationId(1981),
+                        ty: DeclarationId(1984),
                     },
                     Field {
                         label: "NotApplicable".to_string(),
-                        ty: DeclarationId(1982),
+                        ty: DeclarationId(1985),
                     },
                 ],
             },
@@ -24439,7 +24451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Utf8FreeMonoidChar".to_string(),
-                    ty: DeclarationId(1983),
+                    ty: DeclarationId(1986),
                 }],
             },
             type_params: vec![],
@@ -24537,43 +24549,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ListEmpty".to_string(),
-                        ty: DeclarationId(1984),
+                        ty: DeclarationId(1987),
                     },
                     Field {
                         label: "ListSingleton".to_string(),
-                        ty: DeclarationId(1985),
+                        ty: DeclarationId(1988),
                     },
                     Field {
                         label: "ListCons".to_string(),
-                        ty: DeclarationId(1986),
+                        ty: DeclarationId(1989),
                     },
                     Field {
                         label: "ListConcat".to_string(),
-                        ty: DeclarationId(1987),
+                        ty: DeclarationId(1990),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(1988),
+                        ty: DeclarationId(1991),
                     },
                     Field {
                         label: "ListIsEmpty".to_string(),
-                        ty: DeclarationId(1989),
+                        ty: DeclarationId(1992),
                     },
                     Field {
                         label: "ListFold".to_string(),
-                        ty: DeclarationId(1990),
+                        ty: DeclarationId(1993),
                     },
                     Field {
                         label: "ListMap".to_string(),
-                        ty: DeclarationId(1991),
+                        ty: DeclarationId(1994),
                     },
                     Field {
                         label: "ListFilter".to_string(),
-                        ty: DeclarationId(1992),
+                        ty: DeclarationId(1995),
                     },
                     Field {
                         label: "ListContains".to_string(),
-                        ty: DeclarationId(1993),
+                        ty: DeclarationId(1996),
                     },
                 ],
             },
@@ -24655,11 +24667,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PlaceholderPatternStrategy".to_string(),
-                        ty: DeclarationId(1994),
+                        ty: DeclarationId(1997),
                     },
                     Field {
                         label: "VectorList".to_string(),
-                        ty: DeclarationId(1995),
+                        ty: DeclarationId(1998),
                     },
                 ],
             },
@@ -25122,11 +25134,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Borrow".to_string(),
-                        ty: DeclarationId(1996),
+                        ty: DeclarationId(1999),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(1997),
+                        ty: DeclarationId(2000),
                     },
                 ],
             },
@@ -25147,11 +25159,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CopyOrClone".to_string(),
-                        ty: DeclarationId(1998),
+                        ty: DeclarationId(2001),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(1999),
+                        ty: DeclarationId(2002),
                     },
                 ],
             },
@@ -25237,11 +25249,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IndexedArgs".to_string(),
-                        ty: DeclarationId(2000),
+                        ty: DeclarationId(2003),
                     },
                     Field {
                         label: "NamedArg".to_string(),
-                        ty: DeclarationId(2001),
+                        ty: DeclarationId(2004),
                     },
                 ],
             },
@@ -25262,11 +25274,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SingleTemplate".to_string(),
-                        ty: DeclarationId(2002),
+                        ty: DeclarationId(2005),
                     },
                     Field {
                         label: "HigherOrderTemplates".to_string(),
-                        ty: DeclarationId(2003),
+                        ty: DeclarationId(2006),
                     },
                 ],
             },
@@ -25468,7 +25480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({left}, {right}...)".to_string(),
                             ))],
@@ -25481,7 +25493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -25519,7 +25531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "int64(len({recv}))".to_string(),
                             ))],
@@ -25532,7 +25544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -25570,7 +25582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv}) == 0".to_string(),
                             ))],
@@ -25583,7 +25595,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -25623,7 +25635,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* fold({recv}, {init}, {body}) */".to_string(),
                             ))],
@@ -25636,7 +25648,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -25658,7 +25670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2004)),
+            meta_tag: Some(DeclarationId(2007)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -25677,7 +25689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -25690,7 +25702,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -25712,7 +25724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Join({recv}, {arg})".to_string(),
                             ))],
@@ -25725,7 +25737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -25747,7 +25759,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Split({recv}, {arg})".to_string(),
                             ))],
@@ -25760,7 +25772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -25782,7 +25794,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Map({recv}, {arg})".to_string(),
                             ))],
@@ -25795,7 +25807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -25817,7 +25829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Filter({recv}, {arg})".to_string(),
                             ))],
@@ -25830,7 +25842,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -25852,7 +25864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Any({recv}, {arg})".to_string(),
                             ))],
@@ -25865,7 +25877,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -25887,7 +25899,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.All({recv}, {arg})".to_string(),
                             ))],
@@ -25900,7 +25912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -25922,7 +25934,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.FlatMap({recv}, {arg})".to_string(),
                             ))],
@@ -25935,7 +25947,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -25955,7 +25967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -25968,7 +25980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -25988,7 +26000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -26001,7 +26013,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -26023,7 +26035,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.SortBy({recv}, {arg})".to_string(),
                             ))],
@@ -26036,7 +26048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -26058,7 +26070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({recv}, {arg})".to_string(),
                             ))],
@@ -26071,7 +26083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -26093,7 +26105,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Contains({recv}, {arg})".to_string(),
                             ))],
@@ -26106,7 +26118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -26123,23 +26135,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DirectRecursion".to_string(),
-                        ty: DeclarationId(2014),
+                        ty: DeclarationId(2017),
                     },
                     Field {
                         label: "ListRecursion".to_string(),
-                        ty: DeclarationId(2015),
+                        ty: DeclarationId(2018),
                     },
                     Field {
                         label: "OptionalRecursion".to_string(),
-                        ty: DeclarationId(2016),
+                        ty: DeclarationId(2019),
                     },
                     Field {
                         label: "SetRecursion".to_string(),
-                        ty: DeclarationId(2017),
+                        ty: DeclarationId(2020),
                     },
                     Field {
                         label: "MapValueRecursion".to_string(),
-                        ty: DeclarationId(2018),
+                        ty: DeclarationId(2021),
                     },
                 ],
             },
@@ -26251,23 +26263,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "StrictSubValue".to_string(),
-                        ty: DeclarationId(2019),
+                        ty: DeclarationId(2022),
                     },
                     Field {
                         label: "IteratedSubValue".to_string(),
-                        ty: DeclarationId(2020),
+                        ty: DeclarationId(2023),
                     },
                     Field {
                         label: "ArithmeticDescent".to_string(),
-                        ty: DeclarationId(2021),
+                        ty: DeclarationId(2024),
                     },
                     Field {
                         label: "PreservedValue".to_string(),
-                        ty: DeclarationId(2022),
+                        ty: DeclarationId(2025),
                     },
                     Field {
                         label: "SubValueUnknown".to_string(),
-                        ty: DeclarationId(2023),
+                        ty: DeclarationId(2026),
                     },
                 ],
             },
@@ -26418,7 +26430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("sub_value_to_call_pattern".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(960)],
-                output: DeclarationId(2005),
+                output: DeclarationId(2008),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     20518,
@@ -26440,7 +26452,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("sub_value_to_lowering_target".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(960)],
-                output: DeclarationId(2006),
+                output: DeclarationId(2009),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     21906,
@@ -26464,19 +26476,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IntegerExpZero".to_string(),
-                        ty: DeclarationId(2024),
+                        ty: DeclarationId(2027),
                     },
                     Field {
                         label: "IntegerExpPos".to_string(),
-                        ty: DeclarationId(2025),
+                        ty: DeclarationId(2028),
                     },
                     Field {
                         label: "FractionExp".to_string(),
-                        ty: DeclarationId(2026),
+                        ty: DeclarationId(2029),
                     },
                     Field {
                         label: "LogBasedExp".to_string(),
-                        ty: DeclarationId(2027),
+                        ty: DeclarationId(2030),
                     },
                 ],
             },
@@ -26519,11 +26531,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PolyCost".to_string(),
-                        ty: DeclarationId(2028),
+                        ty: DeclarationId(2031),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(2029),
+                        ty: DeclarationId(2032),
                     },
                 ],
             },
@@ -26544,31 +26556,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ConstantBound".to_string(),
-                        ty: DeclarationId(2030),
+                        ty: DeclarationId(2033),
                     },
                     Field {
                         label: "AtomicBound".to_string(),
-                        ty: DeclarationId(2031),
+                        ty: DeclarationId(2034),
                     },
                     Field {
                         label: "ProductBound".to_string(),
-                        ty: DeclarationId(2033),
+                        ty: DeclarationId(2036),
                     },
                     Field {
                         label: "SumOfProductsBound".to_string(),
-                        ty: DeclarationId(2036),
+                        ty: DeclarationId(2039),
                     },
                     Field {
                         label: "SumBound".to_string(),
-                        ty: DeclarationId(2038),
+                        ty: DeclarationId(2041),
                     },
                     Field {
                         label: "ForeverBound".to_string(),
-                        ty: DeclarationId(2039),
+                        ty: DeclarationId(2042),
                     },
                     Field {
                         label: "ErrorBound".to_string(),
-                        ty: DeclarationId(2040),
+                        ty: DeclarationId(2043),
                     },
                 ],
             },
@@ -26586,7 +26598,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(973),
             name: Some("sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2007)],
+                inputs: vec![DeclarationId(2010)],
                 output: DeclarationId(972),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -26862,7 +26874,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("int_add_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(2008),
+                output: DeclarationId(2011),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     31955,
@@ -26884,7 +26896,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("int_mul_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(2009),
+                output: DeclarationId(2012),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     32251,
@@ -26906,7 +26918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("bounded_int_pow_exponent".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2010),
+                output: DeclarationId(2013),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33500,
@@ -26928,7 +26940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("int_pow_bounded".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(2011),
+                output: DeclarationId(2014),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33975,
@@ -26950,7 +26962,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("ceil_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(2012),
+                output: DeclarationId(2015),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35238,
@@ -26977,7 +26989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     DeclarationId(81),
                     DeclarationId(81),
                 ],
-                output: DeclarationId(2013),
+                output: DeclarationId(2016),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35510,
@@ -27385,7 +27397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2041)),
+            meta_tag: Some(DeclarationId(2044)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -27411,7 +27423,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2042)),
+            meta_tag: Some(DeclarationId(2045)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -27436,23 +27448,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(2044),
+                        ty: DeclarationId(2047),
                     },
                     Field {
                         label: "sequential".to_string(),
-                        ty: DeclarationId(2045),
+                        ty: DeclarationId(2048),
                     },
                     Field {
                         label: "branch".to_string(),
-                        ty: DeclarationId(2046),
+                        ty: DeclarationId(2049),
                     },
                     Field {
                         label: "iterate".to_string(),
-                        ty: DeclarationId(2047),
+                        ty: DeclarationId(2050),
                     },
                     Field {
                         label: "validate".to_string(),
-                        ty: DeclarationId(2048),
+                        ty: DeclarationId(2051),
                     },
                 ],
             },
@@ -27487,11 +27499,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Miss".to_string(),
-                        ty: DeclarationId(2051),
+                        ty: DeclarationId(2054),
                     },
                     Field {
                         label: "Hit".to_string(),
-                        ty: DeclarationId(2052),
+                        ty: DeclarationId(2055),
                     },
                 ],
             },
@@ -27524,7 +27536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("miss_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2049),
+                output: DeclarationId(2052),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4589, 4599)),
             },
             type_params: vec![],
@@ -27542,7 +27554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("hit_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2050),
+                output: DeclarationId(2053),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4642, 4654)),
             },
             type_params: vec![],
@@ -27580,7 +27592,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "items".to_string(),
-                    ty: DeclarationId(2053),
+                    ty: DeclarationId(2056),
                 }],
             },
             type_params: vec![],
@@ -27608,7 +27620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "refinement".to_string(),
-                        ty: DeclarationId(2054),
+                        ty: DeclarationId(2057),
                     },
                 ],
             },
@@ -27683,11 +27695,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Positional".to_string(),
-                        ty: DeclarationId(2056),
+                        ty: DeclarationId(2059),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(2058),
+                        ty: DeclarationId(2061),
                     },
                 ],
             },
@@ -27708,19 +27720,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Named".to_string(),
-                        ty: DeclarationId(2059),
+                        ty: DeclarationId(2062),
                     },
                     Field {
                         label: "Parameterized".to_string(),
-                        ty: DeclarationId(2061),
+                        ty: DeclarationId(2064),
                     },
                     Field {
                         label: "Optional".to_string(),
-                        ty: DeclarationId(2062),
+                        ty: DeclarationId(2065),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2064),
+                        ty: DeclarationId(2067),
                     },
                 ],
             },
@@ -27861,15 +27873,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BareVariant".to_string(),
-                        ty: DeclarationId(2065),
+                        ty: DeclarationId(2068),
                     },
                     Field {
                         label: "VariantWith".to_string(),
-                        ty: DeclarationId(2066),
+                        ty: DeclarationId(2069),
                     },
                     Field {
                         label: "VariantFields".to_string(),
-                        ty: DeclarationId(2068),
+                        ty: DeclarationId(2071),
                     },
                 ],
             },
@@ -27890,15 +27902,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Int".to_string(),
-                        ty: DeclarationId(2069),
+                        ty: DeclarationId(2072),
                     },
                     Field {
                         label: "Bool".to_string(),
-                        ty: DeclarationId(2070),
+                        ty: DeclarationId(2073),
                     },
                     Field {
                         label: "String".to_string(),
-                        ty: DeclarationId(2071),
+                        ty: DeclarationId(2074),
                     },
                 ],
             },
@@ -27919,51 +27931,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(2072),
+                        ty: DeclarationId(2075),
                     },
                     Field {
                         label: "Var".to_string(),
-                        ty: DeclarationId(2073),
+                        ty: DeclarationId(2076),
                     },
                     Field {
                         label: "Path".to_string(),
-                        ty: DeclarationId(2076),
+                        ty: DeclarationId(2079),
                     },
                     Field {
                         label: "Call".to_string(),
-                        ty: DeclarationId(2078),
+                        ty: DeclarationId(2081),
                     },
                     Field {
                         label: "VariantRecord".to_string(),
-                        ty: DeclarationId(2080),
+                        ty: DeclarationId(2083),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(2082),
+                        ty: DeclarationId(2085),
                     },
                     Field {
                         label: "Lambda".to_string(),
-                        ty: DeclarationId(2084),
+                        ty: DeclarationId(2087),
                     },
                     Field {
                         label: "If".to_string(),
-                        ty: DeclarationId(2085),
+                        ty: DeclarationId(2088),
                     },
                     Field {
                         label: "Match".to_string(),
-                        ty: DeclarationId(2087),
+                        ty: DeclarationId(2090),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(2089),
+                        ty: DeclarationId(2092),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(2091),
+                        ty: DeclarationId(2094),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(2093),
+                        ty: DeclarationId(2096),
                     },
                 ],
             },
@@ -27984,43 +27996,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Let".to_string(),
-                        ty: DeclarationId(2095),
+                        ty: DeclarationId(2098),
                     },
                     Field {
                         label: "Fn".to_string(),
-                        ty: DeclarationId(2098),
+                        ty: DeclarationId(2101),
                     },
                     Field {
                         label: "FnExternalBody".to_string(),
-                        ty: DeclarationId(2101),
+                        ty: DeclarationId(2104),
                     },
                     Field {
                         label: "Data".to_string(),
-                        ty: DeclarationId(2103),
+                        ty: DeclarationId(2106),
                     },
                     Field {
                         label: "Module".to_string(),
-                        ty: DeclarationId(2105),
+                        ty: DeclarationId(2108),
                     },
                     Field {
                         label: "Import".to_string(),
-                        ty: DeclarationId(2108),
+                        ty: DeclarationId(2111),
                     },
                     Field {
                         label: "TypeAtom".to_string(),
-                        ty: DeclarationId(2110),
+                        ty: DeclarationId(2113),
                     },
                     Field {
                         label: "TypeRecord".to_string(),
-                        ty: DeclarationId(2113),
+                        ty: DeclarationId(2116),
                     },
                     Field {
                         label: "TypeSum".to_string(),
-                        ty: DeclarationId(2117),
+                        ty: DeclarationId(2120),
                     },
                     Field {
                         label: "TypeAlias".to_string(),
-                        ty: DeclarationId(2120),
+                        ty: DeclarationId(2123),
                     },
                 ],
             },
@@ -28062,7 +28074,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[*{left}, *{right}]".to_string(),
                             ))],
@@ -28075,7 +28087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -28117,7 +28129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -28130,7 +28142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -28172,7 +28184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "(len({recv}) == 0)".to_string(),
                             ))],
@@ -28185,7 +28197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -28229,7 +28241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "__v3_fold({recv}, {init}, {body})".to_string(),
                             ))],
@@ -28242,7 +28254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -28268,7 +28280,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2121)),
+            meta_tag: Some(DeclarationId(2124)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -28287,7 +28299,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -28300,7 +28312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -28320,7 +28332,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg}.join({recv})".to_string(),
                             ))],
@@ -28333,7 +28345,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -28353,7 +28365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}.split({arg})".to_string(),
                             ))],
@@ -28366,7 +28378,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -28388,7 +28400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[-1] if {recv} else None".to_string(),
                             ))],
@@ -28401,7 +28413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -28423,7 +28435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[0] if {recv} else None".to_string(),
                             ))],
@@ -28436,7 +28448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -28458,7 +28470,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "list(enumerate({recv}))".to_string(),
                             ))],
@@ -28471,7 +28483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -28493,7 +28505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[ord(c) for c in {recv}]".to_string(),
                             ))],
@@ -28506,7 +28518,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -28528,7 +28540,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[{arg}(x) for x in {recv}]".to_string(),
                             ))],
@@ -28541,7 +28553,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -28563,7 +28575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[x for x in {recv} if {arg}(x)]".to_string(),
                             ))],
@@ -28576,7 +28588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -28598,7 +28610,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "any({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -28611,7 +28623,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -28633,7 +28645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "all({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -28646,7 +28658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -28668,7 +28680,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[y for x in {recv} for y in {arg}(x)]".to_string(),
                             ))],
@@ -28681,7 +28693,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -28701,7 +28713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -28714,7 +28726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -28734,7 +28746,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -28747,7 +28759,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -28769,7 +28781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "sorted({recv}, key={arg})".to_string(),
                             ))],
@@ -28782,7 +28794,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -28802,7 +28814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv} + [{arg}]".to_string(),
                             ))],
@@ -28815,7 +28827,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -28835,7 +28847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg} in {recv}".to_string(),
                             ))],
@@ -28848,7 +28860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -28946,23 +28958,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LiteralValue".to_string(),
-                        ty: DeclarationId(2122),
+                        ty: DeclarationId(2125),
                     },
                     Field {
                         label: "RecordValue".to_string(),
-                        ty: DeclarationId(2124),
+                        ty: DeclarationId(2127),
                     },
                     Field {
                         label: "VariantValue".to_string(),
-                        ty: DeclarationId(2125),
+                        ty: DeclarationId(2128),
                     },
                     Field {
                         label: "NodeRef".to_string(),
-                        ty: DeclarationId(2126),
+                        ty: DeclarationId(2129),
                     },
                     Field {
                         label: "CardinalityValue".to_string(),
-                        ty: DeclarationId(2127),
+                        ty: DeclarationId(2130),
                     },
                 ],
             },
@@ -29015,7 +29027,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bindings".to_string(),
-                    ty: DeclarationId(2128),
+                    ty: DeclarationId(2131),
                 }],
             },
             type_params: vec![],
@@ -29034,7 +29046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "frames".to_string(),
-                    ty: DeclarationId(2129),
+                    ty: DeclarationId(2132),
                 }],
             },
             type_params: vec![],
@@ -29072,7 +29084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "ApplicativeOrder".to_string(),
-                    ty: DeclarationId(2130),
+                    ty: DeclarationId(2133),
                 }],
             },
             type_params: vec![],
@@ -29091,7 +29103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LeftFirst".to_string(),
-                    ty: DeclarationId(2131),
+                    ty: DeclarationId(2134),
                 }],
             },
             type_params: vec![],
@@ -29137,7 +29149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/runtime.dag", 6042, 6153),
         });
-        declarations.push(Declaration { id: DeclarationId(1048), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(607), arguments: vec![TemplateArgument { parameter: DeclarationId(608), value: DeclarationId(946) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2132)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2002), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2001), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(238)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2002), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2001), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2002), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2001), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(240)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2002), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2001), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2002), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2001), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2002), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2001), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2002), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2001), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2003), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2001), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2003), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2001), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2003), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2001), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2003), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2001), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(260)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2002), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2001), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(266)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2002), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2001), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) });
+        declarations.push(Declaration { id: DeclarationId(1048), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(607), arguments: vec![TemplateArgument { parameter: DeclarationId(608), value: DeclarationId(946) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2135)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2005), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2004), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(238)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2005), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2004), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2005), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2004), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(240)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2005), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2004), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2005), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2004), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2005), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2004), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2005), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2004), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2006), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2004), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2006), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2004), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2006), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2004), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2006), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2004), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(260)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2005), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2004), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(266)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2005), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2004), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) });
         declarations.push(Declaration {
             id: DeclarationId(1049),
             name: Some("InputField".to_string()),
@@ -29207,7 +29219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2133),
+                        ty: DeclarationId(2136),
                     },
                     Field {
                         label: "endpoint".to_string(),
@@ -29232,15 +29244,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Strict".to_string(),
-                        ty: DeclarationId(2141),
+                        ty: DeclarationId(2144),
                     },
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2142),
+                        ty: DeclarationId(2145),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2143),
+                        ty: DeclarationId(2146),
                     },
                 ],
             },
@@ -29338,8 +29350,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1058),
             name: Some("optional_evidence_meet".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2134), DeclarationId(2135)],
-                output: DeclarationId(2136),
+                inputs: vec![DeclarationId(2137), DeclarationId(2138)],
+                output: DeclarationId(2139),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2388,
@@ -29360,8 +29372,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1059),
             name: Some("map_evidence_merge_at".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2137), DeclarationId(197), DeclarationId(1053)],
-                output: DeclarationId(2138),
+                inputs: vec![DeclarationId(2140), DeclarationId(197), DeclarationId(1053)],
+                output: DeclarationId(2141),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2733,
@@ -29385,23 +29397,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2144),
+                        ty: DeclarationId(2147),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2145),
+                        ty: DeclarationId(2148),
                     },
                     Field {
                         label: "ArithmeticValue".to_string(),
-                        ty: DeclarationId(2146),
+                        ty: DeclarationId(2149),
                     },
                     Field {
                         label: "TokenPosition".to_string(),
-                        ty: DeclarationId(2147),
+                        ty: DeclarationId(2150),
                     },
                     Field {
                         label: "SetCardinality".to_string(),
-                        ty: DeclarationId(2148),
+                        ty: DeclarationId(2151),
                     },
                 ],
             },
@@ -29422,11 +29434,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OneStep".to_string(),
-                        ty: DeclarationId(2149),
+                        ty: DeclarationId(2152),
                     },
                     Field {
                         label: "AdditionalStep".to_string(),
-                        ty: DeclarationId(2150),
+                        ty: DeclarationId(2153),
                     },
                 ],
             },
@@ -29447,11 +29459,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DivideByTwo".to_string(),
-                        ty: DeclarationId(2151),
+                        ty: DeclarationId(2154),
                     },
                     Field {
                         label: "StrictlyLarger".to_string(),
-                        ty: DeclarationId(2152),
+                        ty: DeclarationId(2155),
                     },
                 ],
             },
@@ -29514,7 +29526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("positive_descent_amount_from_positive_int".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2139),
+                output: DeclarationId(2142),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     5902,
@@ -29536,7 +29548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("proportional_divisor_from_int_at_least_two".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2140),
+                output: DeclarationId(2143),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6342,
@@ -29560,31 +29572,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ChildAccessor".to_string(),
-                        ty: DeclarationId(2153),
+                        ty: DeclarationId(2156),
                     },
                     Field {
                         label: "ListShrink".to_string(),
-                        ty: DeclarationId(2154),
+                        ty: DeclarationId(2157),
                     },
                     Field {
                         label: "ArithmeticSubtractDescent".to_string(),
-                        ty: DeclarationId(2155),
+                        ty: DeclarationId(2158),
                     },
                     Field {
                         label: "ArithmeticDivideDescent".to_string(),
-                        ty: DeclarationId(2156),
+                        ty: DeclarationId(2159),
                     },
                     Field {
                         label: "ParserAdvance".to_string(),
-                        ty: DeclarationId(2157),
+                        ty: DeclarationId(2160),
                     },
                     Field {
                         label: "SetRemoval".to_string(),
-                        ty: DeclarationId(2158),
+                        ty: DeclarationId(2161),
                     },
                     Field {
                         label: "FoldIteration".to_string(),
-                        ty: DeclarationId(2159),
+                        ty: DeclarationId(2162),
                     },
                 ],
             },
@@ -29604,7 +29616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "dimensions".to_string(),
-                    ty: DeclarationId(2160),
+                    ty: DeclarationId(2163),
                 }],
             },
             type_params: vec![],
@@ -29632,7 +29644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(2161),
+                        ty: DeclarationId(2164),
                     },
                 ],
             },
@@ -29653,187 +29665,187 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2162),
+                        ty: DeclarationId(2165),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2163),
+                        ty: DeclarationId(2166),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2164),
+                        ty: DeclarationId(2167),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2165),
+                        ty: DeclarationId(2168),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2166),
+                        ty: DeclarationId(2169),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2167),
+                        ty: DeclarationId(2170),
                     },
                     Field {
                         label: "KwService".to_string(),
-                        ty: DeclarationId(2168),
+                        ty: DeclarationId(2171),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2169),
+                        ty: DeclarationId(2172),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2170),
+                        ty: DeclarationId(2173),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2171),
+                        ty: DeclarationId(2174),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2172),
+                        ty: DeclarationId(2175),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2173),
+                        ty: DeclarationId(2176),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2174),
+                        ty: DeclarationId(2177),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2175),
+                        ty: DeclarationId(2178),
                     },
                     Field {
                         label: "Ident".to_string(),
-                        ty: DeclarationId(2176),
+                        ty: DeclarationId(2179),
                     },
                     Field {
                         label: "IntLit".to_string(),
-                        ty: DeclarationId(2177),
+                        ty: DeclarationId(2180),
                     },
                     Field {
                         label: "StringLit".to_string(),
-                        ty: DeclarationId(2178),
+                        ty: DeclarationId(2181),
                     },
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2179),
+                        ty: DeclarationId(2182),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2180),
+                        ty: DeclarationId(2183),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2181),
+                        ty: DeclarationId(2184),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2182),
+                        ty: DeclarationId(2185),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2183),
+                        ty: DeclarationId(2186),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2184),
+                        ty: DeclarationId(2187),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2185),
+                        ty: DeclarationId(2188),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2186),
+                        ty: DeclarationId(2189),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2187),
+                        ty: DeclarationId(2190),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2188),
+                        ty: DeclarationId(2191),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2189),
+                        ty: DeclarationId(2192),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2190),
+                        ty: DeclarationId(2193),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2191),
+                        ty: DeclarationId(2194),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2192),
+                        ty: DeclarationId(2195),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2193),
+                        ty: DeclarationId(2196),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2194),
+                        ty: DeclarationId(2197),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2195),
+                        ty: DeclarationId(2198),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2196),
+                        ty: DeclarationId(2199),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2197),
+                        ty: DeclarationId(2200),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2198),
+                        ty: DeclarationId(2201),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2199),
+                        ty: DeclarationId(2202),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2200),
+                        ty: DeclarationId(2203),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2201),
+                        ty: DeclarationId(2204),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2202),
+                        ty: DeclarationId(2205),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2203),
+                        ty: DeclarationId(2206),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2204),
+                        ty: DeclarationId(2207),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2205),
+                        ty: DeclarationId(2208),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2206),
+                        ty: DeclarationId(2209),
                     },
                     Field {
                         label: "Eof".to_string(),
-                        ty: DeclarationId(2207),
+                        ty: DeclarationId(2210),
                     },
                 ],
             },
@@ -29879,59 +29891,59 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2208),
+                        ty: DeclarationId(2211),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2209),
+                        ty: DeclarationId(2212),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2210),
+                        ty: DeclarationId(2213),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2211),
+                        ty: DeclarationId(2214),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2212),
+                        ty: DeclarationId(2215),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2213),
+                        ty: DeclarationId(2216),
                     },
                     Field {
                         label: "KwService".to_string(),
-                        ty: DeclarationId(2214),
+                        ty: DeclarationId(2217),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2215),
+                        ty: DeclarationId(2218),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2216),
+                        ty: DeclarationId(2219),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2217),
+                        ty: DeclarationId(2220),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2218),
+                        ty: DeclarationId(2221),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2219),
+                        ty: DeclarationId(2222),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2220),
+                        ty: DeclarationId(2223),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2221),
+                        ty: DeclarationId(2224),
                     },
                 ],
             },
@@ -29952,115 +29964,115 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2222),
+                        ty: DeclarationId(2225),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2223),
+                        ty: DeclarationId(2226),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2224),
+                        ty: DeclarationId(2227),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2225),
+                        ty: DeclarationId(2228),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2226),
+                        ty: DeclarationId(2229),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2227),
+                        ty: DeclarationId(2230),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2228),
+                        ty: DeclarationId(2231),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2229),
+                        ty: DeclarationId(2232),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2230),
+                        ty: DeclarationId(2233),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2231),
+                        ty: DeclarationId(2234),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2232),
+                        ty: DeclarationId(2235),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2233),
+                        ty: DeclarationId(2236),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2234),
+                        ty: DeclarationId(2237),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2235),
+                        ty: DeclarationId(2238),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2236),
+                        ty: DeclarationId(2239),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2237),
+                        ty: DeclarationId(2240),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2238),
+                        ty: DeclarationId(2241),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2239),
+                        ty: DeclarationId(2242),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2240),
+                        ty: DeclarationId(2243),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2241),
+                        ty: DeclarationId(2244),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2242),
+                        ty: DeclarationId(2245),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2243),
+                        ty: DeclarationId(2246),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2244),
+                        ty: DeclarationId(2247),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2245),
+                        ty: DeclarationId(2248),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2246),
+                        ty: DeclarationId(2249),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2247),
+                        ty: DeclarationId(2250),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2248),
+                        ty: DeclarationId(2251),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2249),
+                        ty: DeclarationId(2252),
                     },
                 ],
             },
@@ -30275,31 +30287,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2253),
+                        ty: DeclarationId(2256),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2254),
+                        ty: DeclarationId(2257),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2255),
+                        ty: DeclarationId(2258),
+                    },
+                    Field {
+                        label: "ArityMismatch".to_string(),
+                        ty: DeclarationId(2259),
+                    },
+                    Field {
+                        label: "ResolveError".to_string(),
+                        ty: DeclarationId(2260),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2256),
+                        ty: DeclarationId(2261),
                     },
                     Field {
-                        label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2257),
+                        label: "BranchConditionNotBool".to_string(),
+                        ty: DeclarationId(2262),
                     },
                     Field {
-                        label: "ResolveError".to_string(),
-                        ty: DeclarationId(2258),
+                        label: "MagnitudeOutOfRange".to_string(),
+                        ty: DeclarationId(2263),
+                    },
+                    Field {
+                        label: "MalformedIntegerRangeFact".to_string(),
+                        ty: DeclarationId(2264),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2259),
+                        ty: DeclarationId(2265),
                     },
                 ],
             },
@@ -30311,7 +30335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2456, 2606),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2456, 2687),
         });
         declarations.push(Declaration {
             id: DeclarationId(1086),
@@ -30320,11 +30344,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "AnyDetail".to_string(),
-                        ty: DeclarationId(2260),
+                        ty: DeclarationId(2266),
                     },
                     Field {
                         label: "Contains".to_string(),
-                        ty: DeclarationId(2261),
+                        ty: DeclarationId(2267),
                     },
                 ],
             },
@@ -30336,7 +30360,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2975, 3042),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3056, 3123),
         });
         declarations.push(Declaration {
             id: DeclarationId(1087),
@@ -30361,7 +30385,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3186, 3284),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3267, 3365),
         });
         declarations.push(Declaration {
             id: DeclarationId(1088),
@@ -30370,11 +30394,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(2262),
+                        ty: DeclarationId(2268),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(2263),
+                        ty: DeclarationId(2269),
                     },
                 ],
             },
@@ -30386,7 +30410,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3671, 3724),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3752, 3805),
         });
         declarations.push(Declaration {
             id: DeclarationId(1089),
@@ -30395,15 +30419,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Associativity".to_string(),
-                        ty: DeclarationId(2264),
+                        ty: DeclarationId(2270),
                     },
                     Field {
                         label: "Commutativity".to_string(),
-                        ty: DeclarationId(2265),
+                        ty: DeclarationId(2271),
                     },
                     Field {
                         label: "Identity".to_string(),
-                        ty: DeclarationId(2266),
+                        ty: DeclarationId(2272),
                     },
                 ],
             },
@@ -30415,7 +30439,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4513, 4583),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4594, 4664),
         });
         declarations.push(Declaration {
             id: DeclarationId(1090),
@@ -30424,91 +30448,91 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Compiles".to_string(),
-                        ty: DeclarationId(2267),
+                        ty: DeclarationId(2273),
                     },
                     Field {
                         label: "FailsWithDiagnostic".to_string(),
-                        ty: DeclarationId(2268),
+                        ty: DeclarationId(2274),
                     },
                     Field {
                         label: "OutputEquals".to_string(),
-                        ty: DeclarationId(2269),
+                        ty: DeclarationId(2275),
                     },
                     Field {
                         label: "PortHasState".to_string(),
-                        ty: DeclarationId(2270),
+                        ty: DeclarationId(2276),
                     },
                     Field {
                         label: "DeclarationHasRefinement".to_string(),
-                        ty: DeclarationId(2271),
+                        ty: DeclarationId(2277),
                     },
                     Field {
                         label: "CostBounded".to_string(),
-                        ty: DeclarationId(2272),
+                        ty: DeclarationId(2278),
                     },
                     Field {
                         label: "BehavioralObservation".to_string(),
-                        ty: DeclarationId(2273),
+                        ty: DeclarationId(2279),
                     },
                     Field {
                         label: "MockBackedInvariant".to_string(),
-                        ty: DeclarationId(2274),
+                        ty: DeclarationId(2280),
                     },
                     Field {
                         label: "ExecuteCommand".to_string(),
-                        ty: DeclarationId(2276),
+                        ty: DeclarationId(2282),
                     },
                     Field {
                         label: "ForAllTargets".to_string(),
-                        ty: DeclarationId(2278),
+                        ty: DeclarationId(2284),
                     },
                     Field {
                         label: "LensOutputEquals".to_string(),
-                        ty: DeclarationId(2279),
+                        ty: DeclarationId(2285),
                     },
                     Field {
                         label: "DifferentialEquals".to_string(),
-                        ty: DeclarationId(2280),
+                        ty: DeclarationId(2286),
                     },
                     Field {
                         label: "BinaryDimensionReportEquals".to_string(),
-                        ty: DeclarationId(2281),
+                        ty: DeclarationId(2287),
                     },
                     Field {
                         label: "AlgebraicLaw".to_string(),
-                        ty: DeclarationId(2282),
+                        ty: DeclarationId(2288),
                     },
                     Field {
                         label: "CensusBoundCheck".to_string(),
-                        ty: DeclarationId(2283),
+                        ty: DeclarationId(2289),
                     },
                     Field {
                         label: "CensusSubsetCount".to_string(),
-                        ty: DeclarationId(2284),
+                        ty: DeclarationId(2290),
                     },
                     Field {
                         label: "FixedPointConverges".to_string(),
-                        ty: DeclarationId(2285),
+                        ty: DeclarationId(2291),
                     },
                     Field {
                         label: "RatchetZero".to_string(),
-                        ty: DeclarationId(2286),
+                        ty: DeclarationId(2292),
                     },
                     Field {
                         label: "GeneratedFromDag".to_string(),
-                        ty: DeclarationId(2288),
+                        ty: DeclarationId(2294),
                     },
                     Field {
                         label: "ReleaseDeferredClaim".to_string(),
-                        ty: DeclarationId(2289),
+                        ty: DeclarationId(2295),
                     },
                     Field {
                         label: "SubstrateResearchDeferredClaim".to_string(),
-                        ty: DeclarationId(2290),
+                        ty: DeclarationId(2296),
                     },
                     Field {
                         label: "BridgeLedgerZero".to_string(),
-                        ty: DeclarationId(2291),
+                        ty: DeclarationId(2297),
                     },
                 ],
             },
@@ -30520,7 +30544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4585, 12806),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4666, 12887),
         });
         declarations.push(Declaration {
             id: DeclarationId(1091),
@@ -30534,7 +30558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12914, 12934),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12995, 13015),
         });
         declarations.push(Declaration {
             id: DeclarationId(1092),
@@ -30553,7 +30577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 13077, 13132),
+            span: SourceSpan::new("src/v3/std/verification.dag", 13158, 13213),
         });
         declarations.push(Declaration {
             id: DeclarationId(1093),
@@ -30578,7 +30602,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2292),
+                        ty: DeclarationId(2298),
                     },
                 ],
             },
@@ -30590,7 +30614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 13742, 13875),
+            span: SourceSpan::new("src/v3/std/verification.dag", 13823, 13956),
         });
         declarations.push(Declaration {
             id: DeclarationId(1094),
@@ -30603,7 +30627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "claims".to_string(),
-                        ty: DeclarationId(2293),
+                        ty: DeclarationId(2299),
                     },
                 ],
             },
@@ -30615,7 +30639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 13877, 13936),
+            span: SourceSpan::new("src/v3/std/verification.dag", 13958, 14017),
         });
         declarations.push(Declaration {
             id: DeclarationId(1095),
@@ -30628,7 +30652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "resources".to_string(),
-                        ty: DeclarationId(2294),
+                        ty: DeclarationId(2300),
                     },
                 ],
             },
@@ -30640,18 +30664,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 14134, 14215),
+            span: SourceSpan::new("src/v3/std/verification.dag", 14215, 14296),
         });
         declarations.push(Declaration {
             id: DeclarationId(1096),
             name: Some("claim_obligation_resources".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1093)],
-                output: DeclarationId(2250),
+                output: DeclarationId(2253),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    14657,
-                    14673,
+                    14738,
+                    14754,
                 )),
             },
             type_params: vec![],
@@ -30662,7 +30686,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 14586, 14673),
+            span: SourceSpan::new("src/v3/std/verification.dag", 14667, 14754),
         });
         declarations.push(Declaration {
             id: DeclarationId(1097),
@@ -30672,8 +30696,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 output: DeclarationId(1095),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    14731,
-                    14816,
+                    14812,
+                    14897,
                 )),
             },
             type_params: vec![],
@@ -30684,18 +30708,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 14675, 14816),
+            span: SourceSpan::new("src/v3/std/verification.dag", 14756, 14897),
         });
         declarations.push(Declaration {
             id: DeclarationId(1098),
             name: Some("materialize_test_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2251)],
-                output: DeclarationId(2252),
+                inputs: vec![DeclarationId(2254)],
+                output: DeclarationId(2255),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    14899,
-                    14938,
+                    14980,
+                    15019,
                 )),
             },
             type_params: vec![],
@@ -30706,14 +30730,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 14818, 14938),
+            span: SourceSpan::new("src/v3/std/verification.dag", 14899, 15019),
         });
         declarations.push(Declaration {
             id: DeclarationId(1099),
             name: Some("behavior_spine".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(748)],
-                output: DeclarationId(2295),
+                output: DeclarationId(2301),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(280))),
             },
             type_params: vec![],
@@ -31014,7 +31038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1622),
                                 payload: vec![
@@ -31310,7 +31334,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1971),
+                                    constructor: DeclarationId(1974),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -31408,7 +31432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -31427,7 +31451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state".to_string(),
                                         ))],
@@ -31448,7 +31472,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -31509,7 +31533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -31528,7 +31552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -31547,7 +31571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -31838,7 +31862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -31857,7 +31881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -31920,7 +31944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -31939,7 +31963,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -32002,7 +32026,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -32021,7 +32045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -32083,7 +32107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1971),
+                                    constructor: DeclarationId(1974),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -32143,7 +32167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -32162,7 +32186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -32223,7 +32247,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -32242,7 +32266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -32303,7 +32327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -32322,7 +32346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -32341,7 +32365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -32402,7 +32426,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1972),
+                                        constructor: DeclarationId(1975),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -32421,7 +32445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1972),
+                                        constructor: DeclarationId(1975),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -32481,7 +32505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1972),
+                                    constructor: DeclarationId(1975),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -32540,7 +32564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1971),
+                                    constructor: DeclarationId(1974),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -32599,7 +32623,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1971),
+                                    constructor: DeclarationId(1974),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -32659,7 +32683,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -32680,7 +32704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -32893,7 +32917,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -32912,7 +32936,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -32933,7 +32957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -32954,7 +32978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -32975,7 +32999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -32996,7 +33020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -33017,7 +33041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -33038,7 +33062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -33059,7 +33083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -33078,7 +33102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33369,7 +33393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -33390,7 +33414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -33451,7 +33475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -33472,7 +33496,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33491,7 +33515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -33510,7 +33534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -33609,7 +33633,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33628,7 +33652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -33649,7 +33673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33668,7 +33692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33729,7 +33753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33748,7 +33772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -33767,7 +33791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -33788,7 +33812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33807,7 +33831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33868,7 +33892,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33887,7 +33911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -33906,7 +33930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -33927,7 +33951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33946,7 +33970,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33967,7 +33991,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -34028,7 +34052,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -34047,7 +34071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -34066,7 +34090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -34085,7 +34109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -34104,7 +34128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -34125,7 +34149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -34144,7 +34168,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -34205,7 +34229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -34224,7 +34248,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -34245,7 +34269,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -34264,7 +34288,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -34283,7 +34307,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -34304,7 +34328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -34405,7 +34429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -34424,7 +34448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -34443,7 +34467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -34464,7 +34488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -34524,7 +34548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1971),
+                                    constructor: DeclarationId(1974),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -34622,7 +34646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -34641,7 +34665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -34662,7 +34686,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -34723,7 +34747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -34742,7 +34766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -34803,7 +34827,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -34822,7 +34846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -34841,7 +34865,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -34978,7 +35002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -34997,7 +35021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -35016,7 +35040,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -35077,7 +35101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -35098,7 +35122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -35117,7 +35141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -35136,7 +35160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -35197,7 +35221,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -35216,7 +35240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -35235,7 +35259,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -35296,7 +35320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -35315,7 +35339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -35334,7 +35358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -36212,7 +36236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1984),
+                            constructor: DeclarationId(1987),
                             payload: vec![],
                         },
                     ),
@@ -36249,7 +36273,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1985),
+                            constructor: DeclarationId(1988),
                             payload: vec![],
                         },
                     ),
@@ -36260,7 +36284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1975),
+                                    constructor: DeclarationId(1978),
                                     payload: vec![],
                                 },
                             ),
@@ -36298,7 +36322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -36310,7 +36334,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1975),
+                                        constructor: DeclarationId(1978),
                                         payload: vec![],
                                     },
                                 ),
@@ -36320,7 +36344,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1975),
+                                        constructor: DeclarationId(1978),
                                         payload: vec![],
                                     },
                                 ),
@@ -36359,7 +36383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![],
                         },
                     ),
@@ -36371,7 +36395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1975),
+                                        constructor: DeclarationId(1978),
                                         payload: vec![],
                                     },
                                 ),
@@ -36381,7 +36405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1975),
+                                        constructor: DeclarationId(1978),
                                         payload: vec![],
                                     },
                                 ),
@@ -36420,7 +36444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1988),
+                            constructor: DeclarationId(1991),
                             payload: vec![],
                         },
                     ),
@@ -36431,7 +36455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1974),
+                                    constructor: DeclarationId(1977),
                                     payload: vec![],
                                 },
                             ),
@@ -36570,7 +36594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1989),
+                            constructor: DeclarationId(1992),
                             payload: vec![],
                         },
                     ),
@@ -36581,7 +36605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1974),
+                                    constructor: DeclarationId(1977),
                                     payload: vec![],
                                 },
                             ),
@@ -36619,7 +36643,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1990),
+                            constructor: DeclarationId(1993),
                             payload: vec![],
                         },
                     ),
@@ -36631,7 +36655,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -36641,7 +36665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1975),
+                                        constructor: DeclarationId(1978),
                                         payload: vec![],
                                     },
                                 ),
@@ -36651,7 +36675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -36690,7 +36714,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1991),
+                            constructor: DeclarationId(1994),
                             payload: vec![],
                         },
                     ),
@@ -36702,7 +36726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -36712,7 +36736,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -36751,7 +36775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1992),
+                            constructor: DeclarationId(1995),
                             payload: vec![],
                         },
                     ),
@@ -36763,7 +36787,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -36773,7 +36797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -36812,7 +36836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1993),
+                            constructor: DeclarationId(1996),
                             payload: vec![],
                         },
                     ),
@@ -36824,7 +36848,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -36834,7 +36858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -36873,7 +36897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1995),
+                            constructor: DeclarationId(1998),
                             payload: vec![],
                         },
                     ),
@@ -38301,7 +38325,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1622),
                                 payload: vec![
@@ -38358,7 +38382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1623),
                                 payload: vec![],
@@ -39023,7 +39047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1971),
+                                    constructor: DeclarationId(1974),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -39121,7 +39145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -39140,7 +39164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -39161,7 +39185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -39222,7 +39246,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -39241,7 +39265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -39302,7 +39326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -39321,7 +39345,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -39340,7 +39364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -39477,7 +39501,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -39496,7 +39520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -39515,7 +39539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -39576,7 +39600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -39597,7 +39621,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -39616,7 +39640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -39635,7 +39659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -39696,7 +39720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -39715,7 +39739,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -39734,7 +39758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -39795,7 +39819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -39814,7 +39838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -39833,7 +39857,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -40504,7 +40528,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1984),
+                            constructor: DeclarationId(1987),
                             payload: vec![],
                         },
                     ),
@@ -40541,7 +40565,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1985),
+                            constructor: DeclarationId(1988),
                             payload: vec![],
                         },
                     ),
@@ -40552,7 +40576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1975),
+                                    constructor: DeclarationId(1978),
                                     payload: vec![],
                                 },
                             ),
@@ -40590,7 +40614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -40602,7 +40626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1975),
+                                        constructor: DeclarationId(1978),
                                         payload: vec![],
                                     },
                                 ),
@@ -40612,7 +40636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1975),
+                                        constructor: DeclarationId(1978),
                                         payload: vec![],
                                     },
                                 ),
@@ -40651,7 +40675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![],
                         },
                     ),
@@ -40663,7 +40687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1975),
+                                        constructor: DeclarationId(1978),
                                         payload: vec![],
                                     },
                                 ),
@@ -40673,7 +40697,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1975),
+                                        constructor: DeclarationId(1978),
                                         payload: vec![],
                                     },
                                 ),
@@ -40712,7 +40736,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1988),
+                            constructor: DeclarationId(1991),
                             payload: vec![],
                         },
                     ),
@@ -40723,7 +40747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1974),
+                                    constructor: DeclarationId(1977),
                                     payload: vec![],
                                 },
                             ),
@@ -40761,7 +40785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1989),
+                            constructor: DeclarationId(1992),
                             payload: vec![],
                         },
                     ),
@@ -40772,7 +40796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1974),
+                                    constructor: DeclarationId(1977),
                                     payload: vec![],
                                 },
                             ),
@@ -40810,7 +40834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1990),
+                            constructor: DeclarationId(1993),
                             payload: vec![],
                         },
                     ),
@@ -40822,7 +40846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -40832,7 +40856,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1975),
+                                        constructor: DeclarationId(1978),
                                         payload: vec![],
                                     },
                                 ),
@@ -40842,7 +40866,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -40881,7 +40905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1991),
+                            constructor: DeclarationId(1994),
                             payload: vec![],
                         },
                     ),
@@ -40893,7 +40917,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -40903,7 +40927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -40942,7 +40966,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1992),
+                            constructor: DeclarationId(1995),
                             payload: vec![],
                         },
                     ),
@@ -40954,7 +40978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -40964,7 +40988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -41003,7 +41027,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1993),
+                            constructor: DeclarationId(1996),
                             payload: vec![],
                         },
                     ),
@@ -41015,7 +41039,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -41025,7 +41049,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -41168,7 +41192,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1995),
+                            constructor: DeclarationId(1998),
                             payload: vec![],
                         },
                     ),
@@ -41681,7 +41705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1622),
                                 payload: vec![
@@ -41738,7 +41762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1622),
                                 payload: vec![
@@ -41795,7 +41819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -41838,7 +41862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -41881,7 +41905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -42163,7 +42187,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1971),
+                                    constructor: DeclarationId(1974),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -42261,7 +42285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1972),
+                                        constructor: DeclarationId(1975),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -42280,7 +42304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1972),
+                                        constructor: DeclarationId(1975),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state_value".to_string(),
                                         ))],
@@ -42301,7 +42325,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -42362,7 +42386,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -42381,7 +42405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -42400,7 +42424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -42691,7 +42715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -42710,7 +42734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -42773,7 +42797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -42792,7 +42816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -42855,7 +42879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -42874,7 +42898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -42936,7 +42960,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1971),
+                                    constructor: DeclarationId(1974),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -42998,7 +43022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "0".to_string(),
                                         ))],
@@ -43017,7 +43041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "1".to_string(),
                                         ))],
@@ -43078,7 +43102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -43097,7 +43121,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -43158,7 +43182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -43177,7 +43201,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -43196,7 +43220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -43256,7 +43280,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1972),
+                                    constructor: DeclarationId(1975),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "index_of".to_string(),
                                     ))],
@@ -43316,7 +43340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1972),
+                                        constructor: DeclarationId(1975),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -43335,7 +43359,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1972),
+                                        constructor: DeclarationId(1975),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -43395,7 +43419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1972),
+                                    constructor: DeclarationId(1975),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -43454,7 +43478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1971),
+                                    constructor: DeclarationId(1974),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -43513,7 +43537,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1971),
+                                    constructor: DeclarationId(1974),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -43573,7 +43597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -43594,7 +43618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -43807,7 +43831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -43826,7 +43850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -43847,7 +43871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -43868,7 +43892,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -43889,7 +43913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -43910,7 +43934,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -43931,7 +43955,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -43952,7 +43976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -43973,7 +43997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -43992,7 +44016,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -44283,7 +44307,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -44304,7 +44328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -44365,7 +44389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -44386,7 +44410,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1972),
+                                        constructor: DeclarationId(1975),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -44405,7 +44429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -44424,7 +44448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -44523,7 +44547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -44542,7 +44566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "data".to_string(),
                                         ))],
@@ -44563,7 +44587,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1972),
+                                        constructor: DeclarationId(1975),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -44582,7 +44606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -44603,7 +44627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1972),
+                                        constructor: DeclarationId(1975),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -44664,7 +44688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -44683,7 +44707,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -44702,7 +44726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -44723,7 +44747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1972),
+                                        constructor: DeclarationId(1975),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -44742,7 +44766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -44803,7 +44827,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -44822,7 +44846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -44841,7 +44865,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -44862,7 +44886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1972),
+                                        constructor: DeclarationId(1975),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -44881,7 +44905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -44902,7 +44926,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1972),
+                                        constructor: DeclarationId(1975),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -44963,7 +44987,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -44982,7 +45006,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -45001,7 +45025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -45020,7 +45044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -45039,7 +45063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -45060,7 +45084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1972),
+                                        constructor: DeclarationId(1975),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -45079,7 +45103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -45140,7 +45164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -45159,7 +45183,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -45180,7 +45204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1972),
+                                        constructor: DeclarationId(1975),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -45199,7 +45223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -45218,7 +45242,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -45239,7 +45263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1972),
+                                        constructor: DeclarationId(1975),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -45260,7 +45284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1972),
+                                        constructor: DeclarationId(1975),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -45361,7 +45385,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1972),
+                                        constructor: DeclarationId(1975),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -45380,7 +45404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1972),
+                                        constructor: DeclarationId(1975),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -45399,7 +45423,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1972),
+                                        constructor: DeclarationId(1975),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -45420,7 +45444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1972),
+                                        constructor: DeclarationId(1975),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -45482,7 +45506,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1971),
+                                    constructor: DeclarationId(1974),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -45584,7 +45608,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -45603,7 +45627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -45624,7 +45648,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -45687,7 +45711,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -45706,7 +45730,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -45769,7 +45793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -45788,7 +45812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -45807,7 +45831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -45950,7 +45974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -45969,7 +45993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -45988,7 +46012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46051,7 +46075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -46072,7 +46096,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -46091,7 +46115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -46110,7 +46134,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46173,7 +46197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -46192,7 +46216,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -46211,7 +46235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46274,7 +46298,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -46293,7 +46317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -46312,7 +46336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1971),
+                                        constructor: DeclarationId(1974),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -47231,7 +47255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1984),
+                            constructor: DeclarationId(1987),
                             payload: vec![],
                         },
                     ),
@@ -47268,7 +47292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1985),
+                            constructor: DeclarationId(1988),
                             payload: vec![],
                         },
                     ),
@@ -47279,7 +47303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1975),
+                                    constructor: DeclarationId(1978),
                                     payload: vec![],
                                 },
                             ),
@@ -47317,7 +47341,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -47329,7 +47353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1975),
+                                        constructor: DeclarationId(1978),
                                         payload: vec![],
                                     },
                                 ),
@@ -47339,7 +47363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1975),
+                                        constructor: DeclarationId(1978),
                                         payload: vec![],
                                     },
                                 ),
@@ -47378,7 +47402,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![],
                         },
                     ),
@@ -47390,7 +47414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1975),
+                                        constructor: DeclarationId(1978),
                                         payload: vec![],
                                     },
                                 ),
@@ -47400,7 +47424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1975),
+                                        constructor: DeclarationId(1978),
                                         payload: vec![],
                                     },
                                 ),
@@ -47439,7 +47463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1988),
+                            constructor: DeclarationId(1991),
                             payload: vec![],
                         },
                     ),
@@ -47450,7 +47474,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1974),
+                                    constructor: DeclarationId(1977),
                                     payload: vec![],
                                 },
                             ),
@@ -47624,7 +47648,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1989),
+                            constructor: DeclarationId(1992),
                             payload: vec![],
                         },
                     ),
@@ -47635,7 +47659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1974),
+                                    constructor: DeclarationId(1977),
                                     payload: vec![],
                                 },
                             ),
@@ -47673,7 +47697,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1990),
+                            constructor: DeclarationId(1993),
                             payload: vec![],
                         },
                     ),
@@ -47685,7 +47709,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -47695,7 +47719,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1975),
+                                        constructor: DeclarationId(1978),
                                         payload: vec![],
                                     },
                                 ),
@@ -47705,7 +47729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -47744,7 +47768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1991),
+                            constructor: DeclarationId(1994),
                             payload: vec![],
                         },
                     ),
@@ -47756,7 +47780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -47766,7 +47790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -47805,7 +47829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1992),
+                            constructor: DeclarationId(1995),
                             payload: vec![],
                         },
                     ),
@@ -47817,7 +47841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -47827,7 +47851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -47866,7 +47890,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1993),
+                            constructor: DeclarationId(1996),
                             payload: vec![],
                         },
                     ),
@@ -47878,7 +47902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -47888,7 +47912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1974),
+                                        constructor: DeclarationId(1977),
                                         payload: vec![],
                                     },
                                 ),
@@ -47927,7 +47951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1995),
+                            constructor: DeclarationId(1998),
                             payload: vec![],
                         },
                     ),
@@ -48368,7 +48392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{ let mut __left = {left}; __left.extend({right}); __left }"
                                     .to_string(),
@@ -48382,7 +48406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -48422,7 +48446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).len() as i64".to_string(),
                             ))],
@@ -48435,7 +48459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -48473,7 +48497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).is_empty()".to_string(),
                             ))],
@@ -48486,7 +48510,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -48526,7 +48550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2002),
+                            constructor: DeclarationId(2005),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().fold({init}, {body})".to_string(),
                             ))],
@@ -48539,7 +48563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
@@ -48611,14 +48635,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "read".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1996),
+                            constructor: DeclarationId(1999),
                             payload: vec![],
                         },
                     ),
                     (
                         "construct".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1998),
+                            constructor: DeclarationId(2001),
                             payload: vec![],
                         },
                     ),
@@ -49269,15 +49293,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SnapshotSurface".to_string(),
-                        ty: DeclarationId(2296),
+                        ty: DeclarationId(2302),
                     },
                     Field {
                         label: "SnapshotDag".to_string(),
-                        ty: DeclarationId(2297),
+                        ty: DeclarationId(2303),
                     },
                     Field {
                         label: "SnapshotText".to_string(),
-                        ty: DeclarationId(2298),
+                        ty: DeclarationId(2304),
                     },
                 ],
             },
@@ -49493,7 +49517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2296),
+                            constructor: DeclarationId(2302),
                             payload: vec![],
                         },
                     ),
@@ -49528,7 +49552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2297),
+                            constructor: DeclarationId(2303),
                             payload: vec![],
                         },
                     ),
@@ -49563,7 +49587,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2297),
+                            constructor: DeclarationId(2303),
                             payload: vec![],
                         },
                     ),
@@ -49598,7 +49622,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2297),
+                            constructor: DeclarationId(2303),
                             payload: vec![],
                         },
                     ),
@@ -49633,7 +49657,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2297),
+                            constructor: DeclarationId(2303),
                             payload: vec![],
                         },
                     ),
@@ -49668,7 +49692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2298),
+                            constructor: DeclarationId(2304),
                             payload: vec![],
                         },
                     ),
@@ -49818,7 +49842,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("from_symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(2299),
+                output: DeclarationId(2305),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/operators.dag",
                     156,
@@ -50234,11 +50258,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OrderedRingAlgebra".to_string(),
-                        ty: DeclarationId(2300),
+                        ty: DeclarationId(2306),
                     },
                     Field {
                         label: "SemiringAlgebra".to_string(),
-                        ty: DeclarationId(2301),
+                        ty: DeclarationId(2307),
                     },
                 ],
             },
@@ -50259,11 +50283,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BooleanAlgebraAlgebra".to_string(),
-                        ty: DeclarationId(2302),
+                        ty: DeclarationId(2308),
                     },
                     Field {
                         label: "TerminalAlgebra".to_string(),
-                        ty: DeclarationId(2303),
+                        ty: DeclarationId(2309),
                     },
                 ],
             },
@@ -50284,31 +50308,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BitCarrier".to_string(),
-                        ty: DeclarationId(2304),
+                        ty: DeclarationId(2310),
                     },
                     Field {
                         label: "ByteCarrier".to_string(),
-                        ty: DeclarationId(2305),
+                        ty: DeclarationId(2311),
                     },
                     Field {
                         label: "Word16Carrier".to_string(),
-                        ty: DeclarationId(2306),
+                        ty: DeclarationId(2312),
                     },
                     Field {
                         label: "Word32Carrier".to_string(),
-                        ty: DeclarationId(2307),
+                        ty: DeclarationId(2313),
                     },
                     Field {
                         label: "Word64Carrier".to_string(),
-                        ty: DeclarationId(2308),
+                        ty: DeclarationId(2314),
                     },
                     Field {
                         label: "Word128Carrier".to_string(),
-                        ty: DeclarationId(2309),
+                        ty: DeclarationId(2315),
                     },
                     Field {
                         label: "TerminalCarrier".to_string(),
-                        ty: DeclarationId(2310),
+                        ty: DeclarationId(2316),
                     },
                 ],
             },
@@ -50329,15 +50353,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TwoComplementWrap".to_string(),
-                        ty: DeclarationId(2311),
+                        ty: DeclarationId(2317),
                     },
                     Field {
                         label: "Saturating".to_string(),
-                        ty: DeclarationId(2312),
+                        ty: DeclarationId(2318),
                     },
                     Field {
                         label: "Trap".to_string(),
-                        ty: DeclarationId(2313),
+                        ty: DeclarationId(2319),
                     },
                 ],
             },
@@ -50358,11 +50382,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IntegerPrimitive".to_string(),
-                        ty: DeclarationId(2314),
+                        ty: DeclarationId(2320),
                     },
                     Field {
                         label: "NonIntegerPrimitive".to_string(),
-                        ty: DeclarationId(2315),
+                        ty: DeclarationId(2321),
                     },
                 ],
             },
@@ -50388,83 +50412,83 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2316)),
+            meta_tag: Some(DeclarationId(2322)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
                 FieldValue::Variant {
-                    constructor: DeclarationId(2314),
+                    constructor: DeclarationId(2320),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2300),
+                            constructor: DeclarationId(2306),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2305),
+                            constructor: DeclarationId(2311),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("-128".to_string())),
                         FieldValue::Literal(LiteralBits::String("127".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2311),
+                            constructor: DeclarationId(2317),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2314),
+                    constructor: DeclarationId(2320),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2300),
+                            constructor: DeclarationId(2306),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2306),
+                            constructor: DeclarationId(2312),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("-32768".to_string())),
                         FieldValue::Literal(LiteralBits::String("32767".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2311),
+                            constructor: DeclarationId(2317),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2314),
+                    constructor: DeclarationId(2320),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2300),
+                            constructor: DeclarationId(2306),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2307),
+                            constructor: DeclarationId(2313),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("-2147483648".to_string())),
                         FieldValue::Literal(LiteralBits::String("2147483647".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2311),
+                            constructor: DeclarationId(2317),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2314),
+                    constructor: DeclarationId(2320),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2300),
+                            constructor: DeclarationId(2306),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2308),
+                            constructor: DeclarationId(2314),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -50473,21 +50497,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2311),
+                            constructor: DeclarationId(2317),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2314),
+                    constructor: DeclarationId(2320),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2300),
+                            constructor: DeclarationId(2306),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2309),
+                            constructor: DeclarationId(2315),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -50498,84 +50522,84 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2311),
+                            constructor: DeclarationId(2317),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2314),
+                    constructor: DeclarationId(2320),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2301),
+                            constructor: DeclarationId(2307),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2305),
+                            constructor: DeclarationId(2311),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("255".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2311),
+                            constructor: DeclarationId(2317),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2314),
+                    constructor: DeclarationId(2320),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2301),
+                            constructor: DeclarationId(2307),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2306),
+                            constructor: DeclarationId(2312),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("65535".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2311),
+                            constructor: DeclarationId(2317),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2314),
+                    constructor: DeclarationId(2320),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2301),
+                            constructor: DeclarationId(2307),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2307),
+                            constructor: DeclarationId(2313),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("4294967295".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2311),
+                            constructor: DeclarationId(2317),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2314),
+                    constructor: DeclarationId(2320),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2301),
+                            constructor: DeclarationId(2307),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2308),
+                            constructor: DeclarationId(2314),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -50584,36 +50608,36 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2311),
+                            constructor: DeclarationId(2317),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2315),
+                    constructor: DeclarationId(2321),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("bool".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2302),
+                            constructor: DeclarationId(2308),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2304),
+                            constructor: DeclarationId(2310),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2315),
+                    constructor: DeclarationId(2321),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("()".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2303),
+                            constructor: DeclarationId(2309),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2310),
+                            constructor: DeclarationId(2316),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -58317,7 +58341,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1073, 1085),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1073, 1086),
         });
         declarations.push(Declaration {
             id: DeclarationId(1924),
@@ -58331,7 +58355,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1090, 1103),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1091, 1103),
         });
         declarations.push(Declaration {
             id: DeclarationId(1925),
@@ -58359,11 +58383,53 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1125, 1148),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1125, 1147),
         });
         declarations.push(Declaration {
             id: DeclarationId(1927),
             name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1152, 1171),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1928),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1176, 1201),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1929),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1206, 1229),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1930),
+            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -58378,10 +58444,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5348, 5384),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5429, 5465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1928),
+            id: DeclarationId(1931),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58397,10 +58463,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5389, 5430),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5470, 5511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1929),
+            id: DeclarationId(1932),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -58417,10 +58483,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5889, 5905),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5970, 5986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1930),
+            id: DeclarationId(1933),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58436,10 +58502,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9017, 9058),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9098, 9139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1931),
+            id: DeclarationId(1934),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58450,10 +58516,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9355, 9367),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9436, 9448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1932),
+            id: DeclarationId(1935),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -58470,10 +58536,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9637, 9649),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9718, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1933),
+            id: DeclarationId(1936),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58483,7 +58549,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "sites".to_string(),
-                        ty: DeclarationId(1932),
+                        ty: DeclarationId(1935),
                     },
                 ],
             },
@@ -58495,10 +58561,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9594, 9651),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9675, 9732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1934),
+            id: DeclarationId(1937),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58514,10 +58580,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9961, 9995),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10042, 10076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1935),
+            id: DeclarationId(1938),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58533,10 +58599,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10398, 10449),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10479, 10530),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1936),
+            id: DeclarationId(1939),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58547,10 +58613,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10792, 10810),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10873, 10891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1937),
+            id: DeclarationId(1940),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58576,10 +58642,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 11160, 11258),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 11241, 11339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1938),
+            id: DeclarationId(1941),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -58599,7 +58665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4846, 4866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1939),
+            id: DeclarationId(1942),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(886),
@@ -58625,7 +58691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4876, 4900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1940),
+            id: DeclarationId(1943),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(886),
@@ -58651,7 +58717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4911, 4935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1941),
+            id: DeclarationId(1944),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(886),
@@ -58677,7 +58743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4941, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1942),
+            id: DeclarationId(1945),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -58697,7 +58763,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5042, 5062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1943),
+            id: DeclarationId(1946),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(886),
@@ -58723,7 +58789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5072, 5096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1944),
+            id: DeclarationId(1947),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(886),
@@ -58749,7 +58815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5107, 5131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1945),
+            id: DeclarationId(1948),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(886),
@@ -58775,7 +58841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5137, 5161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1946),
+            id: DeclarationId(1949),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -58795,7 +58861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5245, 5265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1947),
+            id: DeclarationId(1950),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(886),
@@ -58821,7 +58887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5276, 5300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1948),
+            id: DeclarationId(1951),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(886),
@@ -58847,7 +58913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5325, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1949),
+            id: DeclarationId(1952),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -58867,7 +58933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5440, 5460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1950),
+            id: DeclarationId(1953),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(886),
@@ -58893,7 +58959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5471, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1951),
+            id: DeclarationId(1954),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(886),
@@ -58919,7 +58985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5520, 5544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1952),
+            id: DeclarationId(1955),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58938,7 +59004,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1634, 1651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1953),
+            id: DeclarationId(1956),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58963,7 +59029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1656, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1954),
+            id: DeclarationId(1957),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58977,7 +59043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1879, 1891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1955),
+            id: DeclarationId(1958),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58996,7 +59062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1896, 1932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1956),
+            id: DeclarationId(1959),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(879),
@@ -59016,13 +59082,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2414, 2430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1957),
+            id: DeclarationId(1960),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(608),
-                    value: DeclarationId(1956),
+                    value: DeclarationId(1959),
                 }],
             },
             type_params: vec![],
@@ -59036,7 +59102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2409, 2431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1958),
+            id: DeclarationId(1961),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59050,7 +59116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1957),
+                        ty: DeclarationId(1960),
                     },
                 ],
             },
@@ -59065,7 +59131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2325, 2437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1959),
+            id: DeclarationId(1962),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -59085,7 +59151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2505, 2521),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1960),
+            id: DeclarationId(1963),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(879),
@@ -59105,13 +59171,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2544, 2560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1961),
+            id: DeclarationId(1964),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(608),
-                    value: DeclarationId(1960),
+                    value: DeclarationId(1963),
                 }],
             },
             type_params: vec![],
@@ -59125,7 +59191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2539, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1962),
+            id: DeclarationId(1965),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59135,11 +59201,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "violations".to_string(),
-                        ty: DeclarationId(1959),
+                        ty: DeclarationId(1962),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1961),
+                        ty: DeclarationId(1964),
                     },
                 ],
             },
@@ -59154,7 +59220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2442, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1963),
+            id: DeclarationId(1966),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(879),
@@ -59174,11 +59240,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3902, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1964),
+            id: DeclarationId(1967),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(748), DeclarationId(747)],
-                output: DeclarationId(1963),
+                output: DeclarationId(1966),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -59192,7 +59258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3881, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1965),
+            id: DeclarationId(1968),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -59212,7 +59278,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3930, 3945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1966),
+            id: DeclarationId(1969),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747), DeclarationId(885)],
@@ -59230,7 +59296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3966, 4009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1967),
+            id: DeclarationId(1970),
             name: Some("DimensionUnitAbelianGroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(25),
@@ -59250,7 +59316,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1968),
+            id: DeclarationId(1971),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -59270,7 +59336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1969),
+            id: DeclarationId(1972),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59284,7 +59350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4188, 4204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1970),
+            id: DeclarationId(1973),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59303,7 +59369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4209, 4237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1971),
+            id: DeclarationId(1974),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59322,7 +59388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4727, 4746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1972),
+            id: DeclarationId(1975),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59341,7 +59407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4751, 4773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1973),
+            id: DeclarationId(1976),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -59361,7 +59427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5142, 5165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1974),
+            id: DeclarationId(1977),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59375,7 +59441,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6162, 6170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1975),
+            id: DeclarationId(1978),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59389,7 +59455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6175, 6183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1976),
+            id: DeclarationId(1979),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59403,7 +59469,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1977),
+            id: DeclarationId(1980),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59417,7 +59483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6634, 6642),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1978),
+            id: DeclarationId(1981),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59431,7 +59497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6978, 6991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1979),
+            id: DeclarationId(1982),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59445,7 +59511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6996, 7002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1980),
+            id: DeclarationId(1983),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59459,7 +59525,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7260, 7268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1981),
+            id: DeclarationId(1984),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59473,7 +59539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7273, 7278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1982),
+            id: DeclarationId(1985),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59487,7 +59553,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7283, 7296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1983),
+            id: DeclarationId(1986),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59501,7 +59567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7633, 7651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1984),
+            id: DeclarationId(1987),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59515,7 +59581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9026, 9035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1985),
+            id: DeclarationId(1988),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59529,7 +59595,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9040, 9053),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1986),
+            id: DeclarationId(1989),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59543,7 +59609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9058, 9066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1987),
+            id: DeclarationId(1990),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59557,7 +59623,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9071, 9081),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1988),
+            id: DeclarationId(1991),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59571,7 +59637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9086, 9096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1989),
+            id: DeclarationId(1992),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59585,7 +59651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9101, 9112),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1990),
+            id: DeclarationId(1993),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59599,7 +59665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9117, 9125),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1991),
+            id: DeclarationId(1994),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59613,7 +59679,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9130, 9137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1992),
+            id: DeclarationId(1995),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59627,7 +59693,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9142, 9152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1993),
+            id: DeclarationId(1996),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59641,7 +59707,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9157, 9169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1994),
+            id: DeclarationId(1997),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59655,7 +59721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11862, 11888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1995),
+            id: DeclarationId(1998),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59669,7 +59735,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11893, 11903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1996),
+            id: DeclarationId(1999),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59683,7 +59749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16115, 16121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1997),
+            id: DeclarationId(2000),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59697,7 +59763,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16126, 16137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1998),
+            id: DeclarationId(2001),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59711,7 +59777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16457, 16468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1999),
+            id: DeclarationId(2002),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59725,7 +59791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16473, 16484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2000),
+            id: DeclarationId(2003),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59739,7 +59805,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 18417, 18428),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2001),
+            id: DeclarationId(2004),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59753,7 +59819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 18433, 18441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2002),
+            id: DeclarationId(2005),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59772,7 +59838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19604, 19639),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2003),
+            id: DeclarationId(2006),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59797,7 +59863,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19644, 19732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2004),
+            id: DeclarationId(2007),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -59817,7 +59883,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 4881, 4909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2005),
+            id: DeclarationId(2008),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(847),
@@ -59834,7 +59900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 20505, 20517),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2006),
+            id: DeclarationId(2009),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(850),
@@ -59851,7 +59917,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 21890, 21905),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2007),
+            id: DeclarationId(2010),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -59871,7 +59937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27797, 27812),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2008),
+            id: DeclarationId(2011),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -59888,7 +59954,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 31950, 31954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2009),
+            id: DeclarationId(2012),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -59905,7 +59971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 32246, 32250),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2010),
+            id: DeclarationId(2013),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -59922,7 +59988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33495, 33499),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2011),
+            id: DeclarationId(2014),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -59939,7 +60005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33970, 33974),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2012),
+            id: DeclarationId(2015),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -59956,7 +60022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35233, 35237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2013),
+            id: DeclarationId(2016),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -59973,7 +60039,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35505, 35509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2014),
+            id: DeclarationId(2017),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59987,7 +60053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5562, 5577),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2015),
+            id: DeclarationId(2018),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60001,7 +60067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5617, 5630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2016),
+            id: DeclarationId(2019),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60015,7 +60081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5678, 5695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2017),
+            id: DeclarationId(2020),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60029,7 +60095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5734, 5746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2018),
+            id: DeclarationId(2021),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60043,7 +60109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5794, 5811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2019),
+            id: DeclarationId(2022),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60068,7 +60134,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 9904, 9966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2020),
+            id: DeclarationId(2023),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60087,7 +60153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10013),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2021),
+            id: DeclarationId(2024),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60112,7 +60178,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10018, 10075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2022),
+            id: DeclarationId(2025),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60126,7 +60192,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10080, 10094),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2023),
+            id: DeclarationId(2026),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60140,7 +60206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10099, 10114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2024),
+            id: DeclarationId(2027),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60154,7 +60220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24082, 24096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2025),
+            id: DeclarationId(2028),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60173,7 +60239,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24101, 24148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2026),
+            id: DeclarationId(2029),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60198,7 +60264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24153, 24230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2027),
+            id: DeclarationId(2030),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60223,7 +60289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24235, 24309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2028),
+            id: DeclarationId(2031),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60248,7 +60314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24929, 24985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2029),
+            id: DeclarationId(2032),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60267,7 +60333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 25001, 25026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2030),
+            id: DeclarationId(2033),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60281,7 +60347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26675, 26688),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2031),
+            id: DeclarationId(2034),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60300,7 +60366,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26732, 26764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2032),
+            id: DeclarationId(2035),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60320,12 +60386,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26827, 26843),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2033),
+            id: DeclarationId(2036),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "factors".to_string(),
-                    ty: DeclarationId(2032),
+                    ty: DeclarationId(2035),
                 }],
             },
             type_params: vec![],
@@ -60339,7 +60405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26803, 26845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2034),
+            id: DeclarationId(2037),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60359,13 +60425,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26907, 26923),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2035),
+            id: DeclarationId(2038),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(608),
-                    value: DeclarationId(2034),
+                    value: DeclarationId(2037),
                 }],
             },
             type_params: vec![],
@@ -60379,12 +60445,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26902, 26924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2036),
+            id: DeclarationId(2039),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2035),
+                    ty: DeclarationId(2038),
                 }],
             },
             type_params: vec![],
@@ -60398,7 +60464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26874, 26926),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2037),
+            id: DeclarationId(2040),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60418,12 +60484,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27224, 27239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2038),
+            id: DeclarationId(2041),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2037),
+                    ty: DeclarationId(2040),
                 }],
             },
             type_params: vec![],
@@ -60437,7 +60503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27206, 27241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2039),
+            id: DeclarationId(2042),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60451,7 +60517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27324, 27336),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2040),
+            id: DeclarationId(2043),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60465,7 +60531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27406, 27416),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2041),
+            id: DeclarationId(2044),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60485,7 +60551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1234, 1254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2042),
+            id: DeclarationId(2045),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60505,7 +60571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1414, 1434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2043),
+            id: DeclarationId(2046),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(879),
@@ -60525,11 +60591,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2044),
+            id: DeclarationId(2047),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(748), DeclarationId(747)],
-                output: DeclarationId(2043),
+                output: DeclarationId(2046),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -60543,7 +60609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2045),
+            id: DeclarationId(2048),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -60563,7 +60629,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2046),
+            id: DeclarationId(2049),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1011), DeclarationId(1011)],
@@ -60581,7 +60647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2047),
+            id: DeclarationId(2050),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1011), DeclarationId(738)],
@@ -60599,7 +60665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2048),
+            id: DeclarationId(2051),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(748), DeclarationId(1011)],
@@ -60617,7 +60683,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2049),
+            id: DeclarationId(2052),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1012),
@@ -60637,7 +60703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4577, 4588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2050),
+            id: DeclarationId(2053),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1012),
@@ -60657,7 +60723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4630, 4641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2051),
+            id: DeclarationId(2054),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60671,7 +60737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4532, 4536),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2052),
+            id: DeclarationId(2055),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60690,7 +60756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4541, 4551),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2053),
+            id: DeclarationId(2056),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60710,7 +60776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1179, 1196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2054),
+            id: DeclarationId(2057),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1029),
@@ -60727,7 +60793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2055),
+            id: DeclarationId(2058),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60747,12 +60813,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1747, 1764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2056),
+            id: DeclarationId(2059),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2055),
+                    ty: DeclarationId(2058),
                 }],
             },
             type_params: vec![],
@@ -60766,7 +60832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1736, 1765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2057),
+            id: DeclarationId(2060),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60786,12 +60852,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1777, 1795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2058),
+            id: DeclarationId(2061),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2057),
+                    ty: DeclarationId(2060),
                 }],
             },
             type_params: vec![],
@@ -60805,7 +60871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1770, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2059),
+            id: DeclarationId(2062),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60830,7 +60896,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2073, 2113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2060),
+            id: DeclarationId(2063),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60850,7 +60916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2165, 2182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2061),
+            id: DeclarationId(2064),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60860,7 +60926,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2060),
+                        ty: DeclarationId(2063),
                     },
                     Field {
                         label: "span".to_string(),
@@ -60879,7 +60945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2118, 2211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2062),
+            id: DeclarationId(2065),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60904,7 +60970,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2216, 2280),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2063),
+            id: DeclarationId(2066),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60924,13 +60990,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2307, 2324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2064),
+            id: DeclarationId(2067),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2063),
+                        ty: DeclarationId(2066),
                     },
                     Field {
                         label: "output".to_string(),
@@ -60953,7 +61019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2285, 2379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2065),
+            id: DeclarationId(2068),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60978,7 +61044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3749, 3795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2066),
+            id: DeclarationId(2069),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61007,7 +61073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3800, 3883),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2067),
+            id: DeclarationId(2070),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61027,7 +61093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3937, 3962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2068),
+            id: DeclarationId(2071),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61037,7 +61103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2067),
+                        ty: DeclarationId(2070),
                     },
                     Field {
                         label: "span".to_string(),
@@ -61056,7 +61122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3888, 3991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2069),
+            id: DeclarationId(2072),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61075,7 +61141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4578, 4586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2070),
+            id: DeclarationId(2073),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61094,7 +61160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4591, 4601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2071),
+            id: DeclarationId(2074),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61113,7 +61179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4606, 4620),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2072),
+            id: DeclarationId(2075),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61138,7 +61204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4734, 4785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2073),
+            id: DeclarationId(2076),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61163,7 +61229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4790, 4828),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2074),
+            id: DeclarationId(2077),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61183,7 +61249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4856, 4868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2075),
+            id: DeclarationId(2078),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61203,17 +61269,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4890, 4906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2076),
+            id: DeclarationId(2079),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "segments".to_string(),
-                        ty: DeclarationId(2074),
+                        ty: DeclarationId(2077),
                     },
                     Field {
                         label: "segment_spans".to_string(),
-                        ty: DeclarationId(2075),
+                        ty: DeclarationId(2078),
                     },
                     Field {
                         label: "span".to_string(),
@@ -61232,7 +61298,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4833, 4935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2077),
+            id: DeclarationId(2080),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61252,7 +61318,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4980, 4997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2078),
+            id: DeclarationId(2081),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61262,7 +61328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2077),
+                        ty: DeclarationId(2080),
                     },
                     Field {
                         label: "span".to_string(),
@@ -61281,7 +61347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4940, 5026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2079),
+            id: DeclarationId(2082),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61301,7 +61367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5082, 5106),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2080),
+            id: DeclarationId(2083),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61311,7 +61377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2079),
+                        ty: DeclarationId(2082),
                     },
                     Field {
                         label: "span".to_string(),
@@ -61330,7 +61396,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5031, 5135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2081),
+            id: DeclarationId(2084),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61350,7 +61416,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5186, 5203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2082),
+            id: DeclarationId(2085),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61360,7 +61426,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2081),
+                        ty: DeclarationId(2084),
                     },
                     Field {
                         label: "span".to_string(),
@@ -61379,7 +61445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5140, 5232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2083),
+            id: DeclarationId(2086),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61399,13 +61465,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5260, 5272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2084),
+            id: DeclarationId(2087),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2083),
+                        ty: DeclarationId(2086),
                     },
                     Field {
                         label: "body".to_string(),
@@ -61428,7 +61494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5237, 5325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2085),
+            id: DeclarationId(2088),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61461,7 +61527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5330, 5449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2086),
+            id: DeclarationId(2089),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61481,7 +61547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5503, 5524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2087),
+            id: DeclarationId(2090),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61491,7 +61557,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "arms".to_string(),
-                        ty: DeclarationId(2086),
+                        ty: DeclarationId(2089),
                     },
                     Field {
                         label: "span".to_string(),
@@ -61510,7 +61576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5454, 5553),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2088),
+            id: DeclarationId(2091),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61530,13 +61596,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5581, 5605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2089),
+            id: DeclarationId(2092),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2088),
+                        ty: DeclarationId(2091),
                     },
                     Field {
                         label: "span".to_string(),
@@ -61555,7 +61621,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5558, 5634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2090),
+            id: DeclarationId(2093),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61575,13 +61641,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5662, 5679),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2091),
+            id: DeclarationId(2094),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "elements".to_string(),
-                        ty: DeclarationId(2090),
+                        ty: DeclarationId(2093),
                     },
                     Field {
                         label: "span".to_string(),
@@ -61600,7 +61666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5639, 5708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2092),
+            id: DeclarationId(2095),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61620,13 +61686,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 7802, 7823),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2093),
+            id: DeclarationId(2096),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "entries".to_string(),
-                        ty: DeclarationId(2092),
+                        ty: DeclarationId(2095),
                     },
                     Field {
                         label: "span".to_string(),
@@ -61645,7 +61711,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 7781, 7852),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2094),
+            id: DeclarationId(2097),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1022),
@@ -61662,7 +61728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8783, 8795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2095),
+            id: DeclarationId(2098),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61672,7 +61738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_ann".to_string(),
-                        ty: DeclarationId(2094),
+                        ty: DeclarationId(2097),
                     },
                     Field {
                         label: "expr".to_string(),
@@ -61691,7 +61757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8742, 8825),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2096),
+            id: DeclarationId(2099),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61711,7 +61777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8873, 8885),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2097),
+            id: DeclarationId(2100),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61731,7 +61797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8900, 8918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2098),
+            id: DeclarationId(2101),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61741,11 +61807,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2096),
+                        ty: DeclarationId(2099),
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2097),
+                        ty: DeclarationId(2100),
                     },
                     Field {
                         label: "return_type".to_string(),
@@ -61772,7 +61838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8830, 9002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2099),
+            id: DeclarationId(2102),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61792,7 +61858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9062, 9074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2100),
+            id: DeclarationId(2103),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61812,7 +61878,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9089, 9107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2101),
+            id: DeclarationId(2104),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61822,11 +61888,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2099),
+                        ty: DeclarationId(2102),
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2100),
+                        ty: DeclarationId(2103),
                     },
                     Field {
                         label: "return_type".to_string(),
@@ -61853,7 +61919,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9007, 9195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2102),
+            id: DeclarationId(2105),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1029),
@@ -61870,7 +61936,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9260, 9272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2103),
+            id: DeclarationId(2106),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61884,7 +61950,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(2102),
+                        ty: DeclarationId(2105),
                     },
                     Field {
                         label: "body_span".to_string(),
@@ -61907,7 +61973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9200, 9329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2104),
+            id: DeclarationId(2107),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61927,13 +61993,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9349, 9361),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2105),
+            id: DeclarationId(2108),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2104),
+                        ty: DeclarationId(2107),
                     },
                     Field {
                         label: "span".to_string(),
@@ -61952,7 +62018,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9334, 9381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2106),
+            id: DeclarationId(2109),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61972,7 +62038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9407, 9419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2107),
+            id: DeclarationId(2110),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61992,17 +62058,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9433, 9445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2108),
+            id: DeclarationId(2111),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2106),
+                        ty: DeclarationId(2109),
                     },
                     Field {
                         label: "names".to_string(),
-                        ty: DeclarationId(2107),
+                        ty: DeclarationId(2110),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62021,7 +62087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9386, 9474),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2109),
+            id: DeclarationId(2112),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62041,7 +62107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9528, 9540),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2110),
+            id: DeclarationId(2113),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62051,7 +62117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2109),
+                        ty: DeclarationId(2112),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62070,7 +62136,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9479, 9569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2111),
+            id: DeclarationId(2114),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62090,7 +62156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9625, 9637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2112),
+            id: DeclarationId(2115),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62110,7 +62176,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9652, 9670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2113),
+            id: DeclarationId(2116),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62120,11 +62186,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2111),
+                        ty: DeclarationId(2114),
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2112),
+                        ty: DeclarationId(2115),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62143,7 +62209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9574, 9699),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2114),
+            id: DeclarationId(2117),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62163,7 +62229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9752, 9764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2115),
+            id: DeclarationId(2118),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62183,7 +62249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9781, 9801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2116),
+            id: DeclarationId(2119),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1022),
@@ -62200,7 +62266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9818, 9830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2117),
+            id: DeclarationId(2120),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62210,15 +62276,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2114),
+                        ty: DeclarationId(2117),
                     },
                     Field {
                         label: "variants".to_string(),
-                        ty: DeclarationId(2115),
+                        ty: DeclarationId(2118),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(2116),
+                        ty: DeclarationId(2119),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62237,7 +62303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9704, 9859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2118),
+            id: DeclarationId(2121),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62257,7 +62323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9914, 9926),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2119),
+            id: DeclarationId(2122),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1029),
@@ -62274,7 +62340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9998, 10010),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2120),
+            id: DeclarationId(2123),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62284,7 +62350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2118),
+                        ty: DeclarationId(2121),
                     },
                     Field {
                         label: "nominal_opaque".to_string(),
@@ -62296,7 +62362,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "refinement".to_string(),
-                        ty: DeclarationId(2119),
+                        ty: DeclarationId(2122),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62315,7 +62381,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9864, 10039),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2121),
+            id: DeclarationId(2124),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62339,7 +62405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2122),
+            id: DeclarationId(2125),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62358,7 +62424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2132, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2123),
+            id: DeclarationId(2126),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62378,12 +62444,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2174, 2190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2124),
+            id: DeclarationId(2127),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2123),
+                    ty: DeclarationId(2126),
                 }],
             },
             type_params: vec![],
@@ -62397,7 +62463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2162, 2191),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2125),
+            id: DeclarationId(2128),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62422,7 +62488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2196, 2247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2126),
+            id: DeclarationId(2129),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62441,7 +62507,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2252, 2267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2127),
+            id: DeclarationId(2130),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62460,7 +62526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2272, 2299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2128),
+            id: DeclarationId(2131),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -62486,7 +62552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 3931, 3949),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2129),
+            id: DeclarationId(2132),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62506,7 +62572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 4537, 4552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2130),
+            id: DeclarationId(2133),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62525,7 +62591,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5405, 5459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2131),
+            id: DeclarationId(2134),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62539,7 +62605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5724, 5733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2132),
+            id: DeclarationId(2135),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62559,7 +62625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3589, 3617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2133),
+            id: DeclarationId(2136),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -62585,7 +62651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/services.dag", 6838, 6861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2134),
+            id: DeclarationId(2137),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1053),
@@ -62602,7 +62668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2329, 2345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2135),
+            id: DeclarationId(2138),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1053),
@@ -62619,7 +62685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2350, 2366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2136),
+            id: DeclarationId(2139),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1053),
@@ -62636,7 +62702,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2371, 2387),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2137),
+            id: DeclarationId(2140),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -62662,7 +62728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2632, 2660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2138),
+            id: DeclarationId(2141),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -62688,7 +62754,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2704, 2732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2139),
+            id: DeclarationId(2142),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1061),
@@ -62705,7 +62771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5879, 5901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2140),
+            id: DeclarationId(2143),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1062),
@@ -62722,7 +62788,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6321, 6341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2141),
+            id: DeclarationId(2144),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62736,7 +62802,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 667, 673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2142),
+            id: DeclarationId(2145),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62750,7 +62816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 678, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2143),
+            id: DeclarationId(2146),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62764,7 +62830,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 696, 710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2144),
+            id: DeclarationId(2147),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62783,7 +62849,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3232, 3258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2145),
+            id: DeclarationId(2148),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62802,7 +62868,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3263, 3291),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2146),
+            id: DeclarationId(2149),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62821,7 +62887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3296, 3329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2147),
+            id: DeclarationId(2150),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62840,7 +62906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3334, 3365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2148),
+            id: DeclarationId(2151),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62859,7 +62925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3370, 3402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2149),
+            id: DeclarationId(2152),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62873,7 +62939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4409, 4416),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2150),
+            id: DeclarationId(2153),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62892,7 +62958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4421, 4471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2151),
+            id: DeclarationId(2154),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62906,7 +62972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4966, 4977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2152),
+            id: DeclarationId(2155),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62925,7 +62991,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4982, 5027),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2153),
+            id: DeclarationId(2156),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62944,7 +63010,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7131, 7165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2154),
+            id: DeclarationId(2157),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62963,7 +63029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7170, 7214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2155),
+            id: DeclarationId(2158),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62982,7 +63048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7219, 7277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2156),
+            id: DeclarationId(2159),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63001,7 +63067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7282, 7338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2157),
+            id: DeclarationId(2160),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63020,7 +63086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7343, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2158),
+            id: DeclarationId(2161),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63039,7 +63105,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7381, 7411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2159),
+            id: DeclarationId(2162),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63053,7 +63119,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7416, 7429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2160),
+            id: DeclarationId(2163),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -63073,7 +63139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7469, 7491),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2161),
+            id: DeclarationId(2164),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -63093,7 +63159,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7701, 7722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2162),
+            id: DeclarationId(2165),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63107,7 +63173,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2163),
+            id: DeclarationId(2166),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63121,7 +63187,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2164),
+            id: DeclarationId(2167),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63135,7 +63201,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2165),
+            id: DeclarationId(2168),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63149,7 +63215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2166),
+            id: DeclarationId(2169),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63163,7 +63229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2167),
+            id: DeclarationId(2170),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63177,7 +63243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2168),
+            id: DeclarationId(2171),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63191,7 +63257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 716),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2169),
+            id: DeclarationId(2172),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63205,7 +63271,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 721, 729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2170),
+            id: DeclarationId(2173),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63219,7 +63285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 734, 742),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2171),
+            id: DeclarationId(2174),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63233,7 +63299,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 747, 754),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2172),
+            id: DeclarationId(2175),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63247,7 +63313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 759, 765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2173),
+            id: DeclarationId(2176),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63261,7 +63327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 770, 777),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2174),
+            id: DeclarationId(2177),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63275,7 +63341,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 782, 788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2175),
+            id: DeclarationId(2178),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63289,7 +63355,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 793, 800),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2176),
+            id: DeclarationId(2179),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63308,7 +63374,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 805, 818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2177),
+            id: DeclarationId(2180),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63327,7 +63393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 823, 834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2178),
+            id: DeclarationId(2181),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63346,7 +63412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 839, 856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2179),
+            id: DeclarationId(2182),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63360,7 +63426,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 861, 863),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2180),
+            id: DeclarationId(2183),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63374,7 +63440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 868, 872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2181),
+            id: DeclarationId(2184),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63388,7 +63454,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 877, 882),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2182),
+            id: DeclarationId(2185),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63402,7 +63468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 887, 889),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2183),
+            id: DeclarationId(2186),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63416,7 +63482,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 894, 896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2184),
+            id: DeclarationId(2187),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63430,7 +63496,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 901, 903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2185),
+            id: DeclarationId(2188),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63444,7 +63510,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 910),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2186),
+            id: DeclarationId(2189),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63458,7 +63524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 915, 919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2187),
+            id: DeclarationId(2190),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63472,7 +63538,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 924, 929),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2188),
+            id: DeclarationId(2191),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63486,7 +63552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 934, 938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2189),
+            id: DeclarationId(2192),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63500,7 +63566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 943, 948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2190),
+            id: DeclarationId(2193),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63514,7 +63580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 953, 959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2191),
+            id: DeclarationId(2194),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63528,7 +63594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 964, 972),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2192),
+            id: DeclarationId(2195),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63542,7 +63608,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2193),
+            id: DeclarationId(2196),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63556,7 +63622,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 987, 992),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2194),
+            id: DeclarationId(2197),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63570,7 +63636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 997, 1005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2195),
+            id: DeclarationId(2198),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63584,7 +63650,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1010, 1019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2196),
+            id: DeclarationId(2199),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63598,7 +63664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1024, 1027),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2197),
+            id: DeclarationId(2200),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63612,7 +63678,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1032, 1038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2198),
+            id: DeclarationId(2201),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63626,7 +63692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1043, 1049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2199),
+            id: DeclarationId(2202),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63640,7 +63706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1054, 1060),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2200),
+            id: DeclarationId(2203),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63654,7 +63720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1065, 1071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2201),
+            id: DeclarationId(2204),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63668,7 +63734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1076, 1084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2202),
+            id: DeclarationId(2205),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63682,7 +63748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1089, 1097),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2203),
+            id: DeclarationId(2206),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63696,7 +63762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1102, 1107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2204),
+            id: DeclarationId(2207),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63710,7 +63776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2205),
+            id: DeclarationId(2208),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63724,7 +63790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1126, 1130),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2206),
+            id: DeclarationId(2209),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63738,7 +63804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1135, 1143),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2207),
+            id: DeclarationId(2210),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63752,7 +63818,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1148, 1151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2208),
+            id: DeclarationId(2211),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63766,7 +63832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1722, 1727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2209),
+            id: DeclarationId(2212),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63780,7 +63846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1732, 1736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2210),
+            id: DeclarationId(2213),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63794,7 +63860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1741, 1747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2211),
+            id: DeclarationId(2214),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63808,7 +63874,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1752, 1758),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2212),
+            id: DeclarationId(2215),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63822,7 +63888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1763, 1767),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2213),
+            id: DeclarationId(2216),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63836,7 +63902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1772, 1778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2214),
+            id: DeclarationId(2217),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63850,7 +63916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1783, 1792),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2215),
+            id: DeclarationId(2218),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63864,7 +63930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1797, 1805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2216),
+            id: DeclarationId(2219),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63878,7 +63944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2217),
+            id: DeclarationId(2220),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63892,7 +63958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1823, 1830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2218),
+            id: DeclarationId(2221),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63906,7 +63972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1835, 1841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2219),
+            id: DeclarationId(2222),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63920,7 +63986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1846, 1853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2220),
+            id: DeclarationId(2223),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63934,7 +64000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1858, 1864),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2221),
+            id: DeclarationId(2224),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63948,7 +64014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1869, 1876),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2222),
+            id: DeclarationId(2225),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63962,7 +64028,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2316, 2318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2223),
+            id: DeclarationId(2226),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63976,7 +64042,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2323, 2327),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2224),
+            id: DeclarationId(2227),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63990,7 +64056,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2332, 2337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2225),
+            id: DeclarationId(2228),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64004,7 +64070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2342, 2344),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2226),
+            id: DeclarationId(2229),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64018,7 +64084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2349, 2351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2227),
+            id: DeclarationId(2230),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64032,7 +64098,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2356, 2358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2228),
+            id: DeclarationId(2231),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64046,7 +64112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2363, 2365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2229),
+            id: DeclarationId(2232),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64060,7 +64126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2370, 2374),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2230),
+            id: DeclarationId(2233),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64074,7 +64140,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2379, 2384),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2231),
+            id: DeclarationId(2234),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64088,7 +64154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2389, 2393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2232),
+            id: DeclarationId(2235),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64102,7 +64168,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2398, 2403),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2233),
+            id: DeclarationId(2236),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64116,7 +64182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2408, 2414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2234),
+            id: DeclarationId(2237),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64130,7 +64196,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2419, 2427),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2235),
+            id: DeclarationId(2238),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64144,7 +64210,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2432, 2437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2236),
+            id: DeclarationId(2239),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64158,7 +64224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2442, 2447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2237),
+            id: DeclarationId(2240),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64172,7 +64238,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2452, 2460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2238),
+            id: DeclarationId(2241),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64186,7 +64252,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2465, 2474),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2239),
+            id: DeclarationId(2242),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64200,7 +64266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2479, 2482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2240),
+            id: DeclarationId(2243),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64214,7 +64280,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2493),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2241),
+            id: DeclarationId(2244),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64228,7 +64294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2498, 2504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2242),
+            id: DeclarationId(2245),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64242,7 +64308,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2509, 2515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2243),
+            id: DeclarationId(2246),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64256,7 +64322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2244),
+            id: DeclarationId(2247),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64270,7 +64336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2531, 2539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2245),
+            id: DeclarationId(2248),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64284,7 +64350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2544, 2552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2246),
+            id: DeclarationId(2249),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64298,7 +64364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2557, 2562),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2247),
+            id: DeclarationId(2250),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64312,7 +64378,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2567, 2576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2248),
+            id: DeclarationId(2251),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64326,7 +64392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2581, 2585),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2249),
+            id: DeclarationId(2252),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64340,7 +64406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2590, 2598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2250),
+            id: DeclarationId(2253),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -64357,10 +64423,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 14633, 14656),
+            span: SourceSpan::new("src/v3/std/verification.dag", 14714, 14737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2251),
+            id: DeclarationId(2254),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -64377,10 +64443,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 14858, 14873),
+            span: SourceSpan::new("src/v3/std/verification.dag", 14939, 14954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2252),
+            id: DeclarationId(2255),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -64397,10 +64463,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 14878, 14898),
+            span: SourceSpan::new("src/v3/std/verification.dag", 14959, 14979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2253),
+            id: DeclarationId(2256),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64414,7 +64480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2480, 2494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2254),
+            id: DeclarationId(2257),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64428,7 +64494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2499, 2509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2255),
+            id: DeclarationId(2258),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64442,7 +64508,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2514, 2526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2256),
+            id: DeclarationId(2259),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64453,10 +64519,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2531, 2543),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2531, 2544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2257),
+            id: DeclarationId(2260),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64467,10 +64533,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2548, 2561),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2549, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2258),
+            id: DeclarationId(2261),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64484,7 +64550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2566, 2578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2259),
+            id: DeclarationId(2262),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64495,10 +64561,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2583, 2606),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2583, 2605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2260),
+            id: DeclarationId(2263),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64509,10 +64575,52 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3012, 3021),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2610, 2629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2261),
+            id: DeclarationId(2264),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/verification.dag", 2634, 2659),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2265),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/verification.dag", 2664, 2687),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2266),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/verification.dag", 3093, 3102),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2267),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64528,10 +64636,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3026, 3042),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3107, 3123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2262),
+            id: DeclarationId(2268),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64542,10 +64650,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3701, 3709),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3782, 3790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2263),
+            id: DeclarationId(2269),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64556,10 +64664,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3714, 3724),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3795, 3805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2264),
+            id: DeclarationId(2270),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64570,10 +64678,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4539, 4552),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4620, 4633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2265),
+            id: DeclarationId(2271),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64584,10 +64692,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4557, 4570),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4638, 4651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2266),
+            id: DeclarationId(2272),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64598,10 +64706,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4575, 4583),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4656, 4664),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2267),
+            id: DeclarationId(2273),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64612,10 +64720,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4608, 4616),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4689, 4697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2268),
+            id: DeclarationId(2274),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64631,10 +64739,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4621, 4661),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4702, 4742),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2269),
+            id: DeclarationId(2275),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64650,10 +64758,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4666, 4699),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4747, 4780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2270),
+            id: DeclarationId(2276),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64675,10 +64783,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4704, 4782),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4785, 4863),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2271),
+            id: DeclarationId(2277),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64694,10 +64802,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4948, 5011),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5029, 5092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2272),
+            id: DeclarationId(2278),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64723,10 +64831,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5016, 5107),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5097, 5188),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2273),
+            id: DeclarationId(2279),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64752,10 +64860,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5112, 5244),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5193, 5325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2274),
+            id: DeclarationId(2280),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64777,10 +64885,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5459, 5548),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5540, 5629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2275),
+            id: DeclarationId(2281),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -64797,10 +64905,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6348, 6360),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6429, 6441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2276),
+            id: DeclarationId(2282),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64810,7 +64918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2275),
+                        ty: DeclarationId(2281),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -64826,10 +64934,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6297, 6394),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6378, 6475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2277),
+            id: DeclarationId(2283),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -64846,10 +64954,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 7094, 7106),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7175, 7187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2278),
+            id: DeclarationId(2284),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64859,7 +64967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2277),
+                        ty: DeclarationId(2283),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -64875,10 +64983,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 7044, 7140),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7125, 7221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2279),
+            id: DeclarationId(2285),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64904,10 +65012,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 7438, 7560),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7519, 7641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2280),
+            id: DeclarationId(2286),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64933,10 +65041,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 7822, 7947),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7903, 8028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2281),
+            id: DeclarationId(2287),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64958,10 +65066,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 8514, 8626),
+            span: SourceSpan::new("src/v3/std/verification.dag", 8595, 8707),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2282),
+            id: DeclarationId(2288),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64983,10 +65091,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9222, 9301),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9303, 9382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2283),
+            id: DeclarationId(2289),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65012,10 +65120,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9521, 9634),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9602, 9715),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2284),
+            id: DeclarationId(2290),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65041,10 +65149,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9639, 9775),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9720, 9856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2285),
+            id: DeclarationId(2291),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65066,10 +65174,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9780, 9862),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9861, 9943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2286),
+            id: DeclarationId(2292),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65091,10 +65199,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9867, 9953),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9948, 10034),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2287),
+            id: DeclarationId(2293),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -65111,10 +65219,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10032, 10042),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10113, 10123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2288),
+            id: DeclarationId(2294),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65124,7 +65232,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "generated_paths".to_string(),
-                        ty: DeclarationId(2287),
+                        ty: DeclarationId(2293),
                     },
                 ],
             },
@@ -65136,10 +65244,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9958, 10048),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10039, 10129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2289),
+            id: DeclarationId(2295),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65165,10 +65273,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10990, 11124),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11071, 11205),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2290),
+            id: DeclarationId(2296),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65194,10 +65302,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11763, 11907),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11844, 11988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2291),
+            id: DeclarationId(2297),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65213,10 +65321,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12752, 12806),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12833, 12887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2292),
+            id: DeclarationId(2298),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -65233,10 +65341,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 13850, 13873),
+            span: SourceSpan::new("src/v3/std/verification.dag", 13931, 13954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2293),
+            id: DeclarationId(2299),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -65253,10 +65361,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 13919, 13934),
+            span: SourceSpan::new("src/v3/std/verification.dag", 14000, 14015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2294),
+            id: DeclarationId(2300),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -65273,10 +65381,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 14190, 14213),
+            span: SourceSpan::new("src/v3/std/verification.dag", 14271, 14294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2295),
+            id: DeclarationId(2301),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -65296,7 +65404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2296),
+            id: DeclarationId(2302),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65310,7 +65418,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 532, 547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2297),
+            id: DeclarationId(2303),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65324,7 +65432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 550, 561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2298),
+            id: DeclarationId(2304),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65338,7 +65446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2299),
+            id: DeclarationId(2305),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(726),
@@ -65355,7 +65463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2300),
+            id: DeclarationId(2306),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65369,7 +65477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5552, 5570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2301),
+            id: DeclarationId(2307),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65383,7 +65491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5575, 5590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2302),
+            id: DeclarationId(2308),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65397,7 +65505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5619, 5640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2303),
+            id: DeclarationId(2309),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65411,7 +65519,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5645, 5660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2304),
+            id: DeclarationId(2310),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65425,7 +65533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7257, 7267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2305),
+            id: DeclarationId(2311),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65439,7 +65547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7272, 7283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2306),
+            id: DeclarationId(2312),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65453,7 +65561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7288, 7301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2307),
+            id: DeclarationId(2313),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65467,7 +65575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7306, 7319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2308),
+            id: DeclarationId(2314),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65481,7 +65589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7324, 7337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2309),
+            id: DeclarationId(2315),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65495,7 +65603,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7342, 7356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2310),
+            id: DeclarationId(2316),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65509,7 +65617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7361, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2311),
+            id: DeclarationId(2317),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65523,7 +65631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8118, 8135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2312),
+            id: DeclarationId(2318),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65537,7 +65645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8140, 8150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2313),
+            id: DeclarationId(2319),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65551,7 +65659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8155, 8159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2314),
+            id: DeclarationId(2320),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65596,7 +65704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8937, 9509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2315),
+            id: DeclarationId(2321),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65629,7 +65737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9514, 9696),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2316),
+            id: DeclarationId(2322),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -68691,7 +68799,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(379),
             Port {
                 id: PortId(379),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2295))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2301))),
                 produced_by: Some(NodeId(279)),
             },
         );
diff --git a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
index 89a3c38cc93..0320b8c757b 100644
--- a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
+++ b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
@@ -8,7 +8,7 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag {
         ports: bootstrapped_fixture_without_parse_surface_dag_ports(),
         diagnostics: bootstrapped_fixture_without_parse_surface_dag_diagnostics(),
         next_node_id: 315,
-        next_declaration_id: 2234,
+        next_declaration_id: 2240,
         next_port_id: 420,
         primitives: PrimitiveCache::default(),
         substrate_markers: SubstrateMarkers::default(),
@@ -23,7 +23,7 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag {
         callable_strategy_variants: CallableStrategyVariants::default(),
         clusters: bootstrapped_fixture_without_parse_surface_dag_clusters(),
         optional_match_disjs: bootstrapped_fixture_without_parse_surface_dag_optional_match_disjs(),
-        declaration_append_begin_after_bootstrap: 2234,
+        declaration_append_begin_after_bootstrap: 2240,
     }
 }
 
@@ -4126,7 +4126,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
 #[allow(clippy::vec_init_then_push)]
 fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declaration> {
     {
-        let mut declarations = Vec::with_capacity(2234);
+        let mut declarations = Vec::with_capacity(2240);
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -23347,21 +23347,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         ty: DeclarationId(1907),
                     },
                     Field {
-                        label: "UnitMismatch".to_string(),
+                        label: "ArityMismatch".to_string(),
                         ty: DeclarationId(1908),
                     },
                     Field {
-                        label: "ArityMismatch".to_string(),
+                        label: "ResolveError".to_string(),
                         ty: DeclarationId(1909),
                     },
                     Field {
-                        label: "ResolveError".to_string(),
+                        label: "UnitMismatch".to_string(),
                         ty: DeclarationId(1910),
                     },
                     Field {
-                        label: "NominalOpacityViolation".to_string(),
+                        label: "BranchConditionNotBool".to_string(),
                         ty: DeclarationId(1911),
                     },
+                    Field {
+                        label: "MagnitudeOutOfRange".to_string(),
+                        ty: DeclarationId(1912),
+                    },
+                    Field {
+                        label: "MalformedIntegerRangeFact".to_string(),
+                        ty: DeclarationId(1913),
+                    },
+                    Field {
+                        label: "NominalOpacityViolation".to_string(),
+                        ty: DeclarationId(1914),
+                    },
                 ],
             },
             type_params: vec![],
@@ -23372,7 +23384,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 990, 1148),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 990, 1229),
         });
         declarations.push(Declaration {
             id: DeclarationId(873),
@@ -23401,7 +23413,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1354, 1607),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1435, 1688),
         });
         declarations.push(Declaration {
             id: DeclarationId(874),
@@ -23426,7 +23438,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 2387, 2450),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 2468, 2531),
         });
         declarations.push(Declaration {
             id: DeclarationId(875),
@@ -23445,7 +23457,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 4652, 4712),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 4733, 4793),
         });
         declarations.push(Declaration {
             id: DeclarationId(876),
@@ -23454,11 +23466,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CompilerKind".to_string(),
-                        ty: DeclarationId(1912),
+                        ty: DeclarationId(1915),
                     },
                     Field {
                         label: "LensInstanceKind".to_string(),
-                        ty: DeclarationId(1913),
+                        ty: DeclarationId(1916),
                     },
                 ],
             },
@@ -23470,7 +23482,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5321, 5430),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5402, 5511),
         });
         declarations.push(Declaration {
             id: DeclarationId(877),
@@ -23491,7 +23503,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "fixes".to_string(),
-                        ty: DeclarationId(1914),
+                        ty: DeclarationId(1917),
                     },
                 ],
             },
@@ -23503,7 +23515,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5799, 5907),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5880, 5988),
         });
         declarations.push(Declaration {
             id: DeclarationId(878),
@@ -23512,31 +23524,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UnderRefined".to_string(),
-                        ty: DeclarationId(1915),
+                        ty: DeclarationId(1918),
                     },
                     Field {
                         label: "NoInhabitant".to_string(),
-                        ty: DeclarationId(1916),
+                        ty: DeclarationId(1919),
                     },
                     Field {
                         label: "ContradictoryUse".to_string(),
-                        ty: DeclarationId(1918),
+                        ty: DeclarationId(1921),
                     },
                     Field {
                         label: "OutOfR2Scope".to_string(),
-                        ty: DeclarationId(1919),
+                        ty: DeclarationId(1922),
                     },
                     Field {
                         label: "LifetimeProgramExtractionPending".to_string(),
-                        ty: DeclarationId(1920),
+                        ty: DeclarationId(1923),
                     },
                     Field {
                         label: "FoldNotImplemented".to_string(),
-                        ty: DeclarationId(1921),
+                        ty: DeclarationId(1924),
                     },
                     Field {
                         label: "MissingEmissionPath".to_string(),
-                        ty: DeclarationId(1922),
+                        ty: DeclarationId(1925),
                     },
                 ],
             },
@@ -23548,7 +23560,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 8541, 11258),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 8622, 11339),
         });
         declarations.push(Declaration {
             id: DeclarationId(879),
@@ -23557,11 +23569,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Inhabits".to_string(),
-                        ty: DeclarationId(1937),
+                        ty: DeclarationId(1940),
                     },
                     Field {
                         label: "Violates".to_string(),
-                        ty: DeclarationId(1938),
+                        ty: DeclarationId(1941),
                     },
                 ],
             },
@@ -23596,11 +23608,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoDiagnostic".to_string(),
-                        ty: DeclarationId(1939),
+                        ty: DeclarationId(1942),
                     },
                     Field {
                         label: "SomeDiagnostic".to_string(),
-                        ty: DeclarationId(1940),
+                        ty: DeclarationId(1943),
                     },
                 ],
             },
@@ -23621,11 +23633,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DimensionOk".to_string(),
-                        ty: DeclarationId(1943),
+                        ty: DeclarationId(1946),
                     },
                     Field {
                         label: "DimensionFail".to_string(),
-                        ty: DeclarationId(1947),
+                        ty: DeclarationId(1950),
                     },
                 ],
             },
@@ -23664,15 +23676,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "witness_of".to_string(),
-                        ty: DeclarationId(1949),
+                        ty: DeclarationId(1952),
                     },
                     Field {
                         label: "compose".to_string(),
-                        ty: DeclarationId(1950),
+                        ty: DeclarationId(1953),
                     },
                     Field {
                         label: "break_diagnostic".to_string(),
-                        ty: DeclarationId(1951),
+                        ty: DeclarationId(1954),
                     },
                 ],
             },
@@ -23712,7 +23724,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             type_params: vec![DeclarationId(887), DeclarationId(888)],
             phantom_params: vec![PhantomParameter {
                 parameter: DeclarationId(887),
-                algebra: DeclarationId(1952),
+                algebra: DeclarationId(1955),
             }],
             meta_tag: None,
             specialization_parent: None,
@@ -23853,11 +23865,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("add_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1923),
-                    DeclarationId(1924),
-                    DeclarationId(1925),
+                    DeclarationId(1926),
+                    DeclarationId(1927),
+                    DeclarationId(1928),
                 ],
-                output: DeclarationId(1926),
+                output: DeclarationId(1929),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)),
             },
             type_params: vec![DeclarationId(897), DeclarationId(898)],
@@ -23903,11 +23915,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("sub_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1927),
-                    DeclarationId(1928),
-                    DeclarationId(1929),
+                    DeclarationId(1930),
+                    DeclarationId(1931),
+                    DeclarationId(1932),
                 ],
-                output: DeclarationId(1930),
+                output: DeclarationId(1933),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)),
             },
             type_params: vec![DeclarationId(900), DeclarationId(901)],
@@ -23952,8 +23964,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(902),
             name: Some("mul_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1931), DeclarationId(1932), DeclarationId(904)],
-                output: DeclarationId(1933),
+                inputs: vec![DeclarationId(1934), DeclarationId(1935), DeclarationId(904)],
+                output: DeclarationId(1936),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)),
             },
             type_params: vec![DeclarationId(903), DeclarationId(904)],
@@ -23998,8 +24010,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(905),
             name: Some("div_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1934), DeclarationId(1935), DeclarationId(907)],
-                output: DeclarationId(1936),
+                inputs: vec![DeclarationId(1937), DeclarationId(1938), DeclarationId(907)],
+                output: DeclarationId(1939),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)),
             },
             type_params: vec![DeclarationId(906), DeclarationId(907)],
@@ -24063,7 +24075,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(1953),
+                        ty: DeclarationId(1956),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -24125,11 +24137,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "BoundUnspecified".to_string(),
-                        ty: DeclarationId(1954),
+                        ty: DeclarationId(1957),
                     },
                     Field {
                         label: "StaticBoundFact".to_string(),
-                        ty: DeclarationId(1955),
+                        ty: DeclarationId(1958),
                     },
                 ],
             },
@@ -24179,11 +24191,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DirectField".to_string(),
-                        ty: DeclarationId(1956),
+                        ty: DeclarationId(1959),
                     },
                     Field {
                         label: "AccessorMethod".to_string(),
-                        ty: DeclarationId(1957),
+                        ty: DeclarationId(1960),
                     },
                 ],
             },
@@ -24286,7 +24298,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "parameters".to_string(),
-                        ty: DeclarationId(1958),
+                        ty: DeclarationId(1961),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -24336,11 +24348,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(1959),
+                        ty: DeclarationId(1962),
                     },
                     Field {
                         label: "Consumed".to_string(),
-                        ty: DeclarationId(1960),
+                        ty: DeclarationId(1963),
                     },
                 ],
             },
@@ -24361,11 +24373,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Owned".to_string(),
-                        ty: DeclarationId(1961),
+                        ty: DeclarationId(1964),
                     },
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(1962),
+                        ty: DeclarationId(1965),
                     },
                 ],
             },
@@ -24386,11 +24398,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SelfContained".to_string(),
-                        ty: DeclarationId(1963),
+                        ty: DeclarationId(1966),
                     },
                     Field {
                         label: "Caller".to_string(),
-                        ty: DeclarationId(1964),
+                        ty: DeclarationId(1967),
                     },
                 ],
             },
@@ -24411,15 +24423,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Growable".to_string(),
-                        ty: DeclarationId(1965),
+                        ty: DeclarationId(1968),
                     },
                     Field {
                         label: "Fixed".to_string(),
-                        ty: DeclarationId(1966),
+                        ty: DeclarationId(1969),
                     },
                     Field {
                         label: "NotApplicable".to_string(),
-                        ty: DeclarationId(1967),
+                        ty: DeclarationId(1970),
                     },
                 ],
             },
@@ -24439,7 +24451,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Utf8FreeMonoidChar".to_string(),
-                    ty: DeclarationId(1968),
+                    ty: DeclarationId(1971),
                 }],
             },
             type_params: vec![],
@@ -24537,43 +24549,43 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ListEmpty".to_string(),
-                        ty: DeclarationId(1969),
+                        ty: DeclarationId(1972),
                     },
                     Field {
                         label: "ListSingleton".to_string(),
-                        ty: DeclarationId(1970),
+                        ty: DeclarationId(1973),
                     },
                     Field {
                         label: "ListCons".to_string(),
-                        ty: DeclarationId(1971),
+                        ty: DeclarationId(1974),
                     },
                     Field {
                         label: "ListConcat".to_string(),
-                        ty: DeclarationId(1972),
+                        ty: DeclarationId(1975),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(1973),
+                        ty: DeclarationId(1976),
                     },
                     Field {
                         label: "ListIsEmpty".to_string(),
-                        ty: DeclarationId(1974),
+                        ty: DeclarationId(1977),
                     },
                     Field {
                         label: "ListFold".to_string(),
-                        ty: DeclarationId(1975),
+                        ty: DeclarationId(1978),
                     },
                     Field {
                         label: "ListMap".to_string(),
-                        ty: DeclarationId(1976),
+                        ty: DeclarationId(1979),
                     },
                     Field {
                         label: "ListFilter".to_string(),
-                        ty: DeclarationId(1977),
+                        ty: DeclarationId(1980),
                     },
                     Field {
                         label: "ListContains".to_string(),
-                        ty: DeclarationId(1978),
+                        ty: DeclarationId(1981),
                     },
                 ],
             },
@@ -24655,11 +24667,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PlaceholderPatternStrategy".to_string(),
-                        ty: DeclarationId(1979),
+                        ty: DeclarationId(1982),
                     },
                     Field {
                         label: "VectorList".to_string(),
-                        ty: DeclarationId(1980),
+                        ty: DeclarationId(1983),
                     },
                 ],
             },
@@ -25122,11 +25134,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Borrow".to_string(),
-                        ty: DeclarationId(1981),
+                        ty: DeclarationId(1984),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(1982),
+                        ty: DeclarationId(1985),
                     },
                 ],
             },
@@ -25147,11 +25159,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CopyOrClone".to_string(),
-                        ty: DeclarationId(1983),
+                        ty: DeclarationId(1986),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(1984),
+                        ty: DeclarationId(1987),
                     },
                 ],
             },
@@ -25237,11 +25249,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IndexedArgs".to_string(),
-                        ty: DeclarationId(1985),
+                        ty: DeclarationId(1988),
                     },
                     Field {
                         label: "NamedArg".to_string(),
-                        ty: DeclarationId(1986),
+                        ty: DeclarationId(1989),
                     },
                 ],
             },
@@ -25262,11 +25274,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SingleTemplate".to_string(),
-                        ty: DeclarationId(1987),
+                        ty: DeclarationId(1990),
                     },
                     Field {
                         label: "HigherOrderTemplates".to_string(),
-                        ty: DeclarationId(1988),
+                        ty: DeclarationId(1991),
                     },
                 ],
             },
@@ -25468,7 +25480,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({left}, {right}...)".to_string(),
                             ))],
@@ -25481,7 +25493,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -25519,7 +25531,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "int64(len({recv}))".to_string(),
                             ))],
@@ -25532,7 +25544,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -25570,7 +25582,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv}) == 0".to_string(),
                             ))],
@@ -25583,7 +25595,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -25623,7 +25635,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* fold({recv}, {init}, {body}) */".to_string(),
                             ))],
@@ -25636,7 +25648,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -25658,7 +25670,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1989)),
+            meta_tag: Some(DeclarationId(1992)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -25677,7 +25689,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -25690,7 +25702,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -25712,7 +25724,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Join({recv}, {arg})".to_string(),
                             ))],
@@ -25725,7 +25737,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -25747,7 +25759,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Split({recv}, {arg})".to_string(),
                             ))],
@@ -25760,7 +25772,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -25782,7 +25794,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Map({recv}, {arg})".to_string(),
                             ))],
@@ -25795,7 +25807,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -25817,7 +25829,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Filter({recv}, {arg})".to_string(),
                             ))],
@@ -25830,7 +25842,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -25852,7 +25864,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Any({recv}, {arg})".to_string(),
                             ))],
@@ -25865,7 +25877,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -25887,7 +25899,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.All({recv}, {arg})".to_string(),
                             ))],
@@ -25900,7 +25912,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -25922,7 +25934,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.FlatMap({recv}, {arg})".to_string(),
                             ))],
@@ -25935,7 +25947,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -25955,7 +25967,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -25968,7 +25980,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -25988,7 +26000,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -26001,7 +26013,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -26023,7 +26035,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.SortBy({recv}, {arg})".to_string(),
                             ))],
@@ -26036,7 +26048,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -26058,7 +26070,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({recv}, {arg})".to_string(),
                             ))],
@@ -26071,7 +26083,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -26093,7 +26105,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Contains({recv}, {arg})".to_string(),
                             ))],
@@ -26106,7 +26118,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -26123,23 +26135,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DirectRecursion".to_string(),
-                        ty: DeclarationId(1999),
+                        ty: DeclarationId(2002),
                     },
                     Field {
                         label: "ListRecursion".to_string(),
-                        ty: DeclarationId(2000),
+                        ty: DeclarationId(2003),
                     },
                     Field {
                         label: "OptionalRecursion".to_string(),
-                        ty: DeclarationId(2001),
+                        ty: DeclarationId(2004),
                     },
                     Field {
                         label: "SetRecursion".to_string(),
-                        ty: DeclarationId(2002),
+                        ty: DeclarationId(2005),
                     },
                     Field {
                         label: "MapValueRecursion".to_string(),
-                        ty: DeclarationId(2003),
+                        ty: DeclarationId(2006),
                     },
                 ],
             },
@@ -26251,23 +26263,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "StrictSubValue".to_string(),
-                        ty: DeclarationId(2004),
+                        ty: DeclarationId(2007),
                     },
                     Field {
                         label: "IteratedSubValue".to_string(),
-                        ty: DeclarationId(2005),
+                        ty: DeclarationId(2008),
                     },
                     Field {
                         label: "ArithmeticDescent".to_string(),
-                        ty: DeclarationId(2006),
+                        ty: DeclarationId(2009),
                     },
                     Field {
                         label: "PreservedValue".to_string(),
-                        ty: DeclarationId(2007),
+                        ty: DeclarationId(2010),
                     },
                     Field {
                         label: "SubValueUnknown".to_string(),
-                        ty: DeclarationId(2008),
+                        ty: DeclarationId(2011),
                     },
                 ],
             },
@@ -26418,7 +26430,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("sub_value_to_call_pattern".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(960)],
-                output: DeclarationId(1990),
+                output: DeclarationId(1993),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     20518,
@@ -26440,7 +26452,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("sub_value_to_lowering_target".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(960)],
-                output: DeclarationId(1991),
+                output: DeclarationId(1994),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     21906,
@@ -26464,19 +26476,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IntegerExpZero".to_string(),
-                        ty: DeclarationId(2009),
+                        ty: DeclarationId(2012),
                     },
                     Field {
                         label: "IntegerExpPos".to_string(),
-                        ty: DeclarationId(2010),
+                        ty: DeclarationId(2013),
                     },
                     Field {
                         label: "FractionExp".to_string(),
-                        ty: DeclarationId(2011),
+                        ty: DeclarationId(2014),
                     },
                     Field {
                         label: "LogBasedExp".to_string(),
-                        ty: DeclarationId(2012),
+                        ty: DeclarationId(2015),
                     },
                 ],
             },
@@ -26519,11 +26531,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PolyCost".to_string(),
-                        ty: DeclarationId(2013),
+                        ty: DeclarationId(2016),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(2014),
+                        ty: DeclarationId(2017),
                     },
                 ],
             },
@@ -26544,31 +26556,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ConstantBound".to_string(),
-                        ty: DeclarationId(2015),
+                        ty: DeclarationId(2018),
                     },
                     Field {
                         label: "AtomicBound".to_string(),
-                        ty: DeclarationId(2016),
+                        ty: DeclarationId(2019),
                     },
                     Field {
                         label: "ProductBound".to_string(),
-                        ty: DeclarationId(2018),
+                        ty: DeclarationId(2021),
                     },
                     Field {
                         label: "SumOfProductsBound".to_string(),
-                        ty: DeclarationId(2021),
+                        ty: DeclarationId(2024),
                     },
                     Field {
                         label: "SumBound".to_string(),
-                        ty: DeclarationId(2023),
+                        ty: DeclarationId(2026),
                     },
                     Field {
                         label: "ForeverBound".to_string(),
-                        ty: DeclarationId(2024),
+                        ty: DeclarationId(2027),
                     },
                     Field {
                         label: "ErrorBound".to_string(),
-                        ty: DeclarationId(2025),
+                        ty: DeclarationId(2028),
                     },
                 ],
             },
@@ -26586,7 +26598,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(973),
             name: Some("sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1992)],
+                inputs: vec![DeclarationId(1995)],
                 output: DeclarationId(972),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -26862,7 +26874,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("int_add_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(1993),
+                output: DeclarationId(1996),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     31955,
@@ -26884,7 +26896,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("int_mul_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(1994),
+                output: DeclarationId(1997),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     32251,
@@ -26906,7 +26918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("bounded_int_pow_exponent".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(1995),
+                output: DeclarationId(1998),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33500,
@@ -26928,7 +26940,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("int_pow_bounded".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(1996),
+                output: DeclarationId(1999),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33975,
@@ -26950,7 +26962,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("ceil_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(1997),
+                output: DeclarationId(2000),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35238,
@@ -26977,7 +26989,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     DeclarationId(81),
                     DeclarationId(81),
                 ],
-                output: DeclarationId(1998),
+                output: DeclarationId(2001),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35510,
@@ -27385,7 +27397,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2026)),
+            meta_tag: Some(DeclarationId(2029)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -27411,7 +27423,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2027)),
+            meta_tag: Some(DeclarationId(2030)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -27436,23 +27448,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(2029),
+                        ty: DeclarationId(2032),
                     },
                     Field {
                         label: "sequential".to_string(),
-                        ty: DeclarationId(2030),
+                        ty: DeclarationId(2033),
                     },
                     Field {
                         label: "branch".to_string(),
-                        ty: DeclarationId(2031),
+                        ty: DeclarationId(2034),
                     },
                     Field {
                         label: "iterate".to_string(),
-                        ty: DeclarationId(2032),
+                        ty: DeclarationId(2035),
                     },
                     Field {
                         label: "validate".to_string(),
-                        ty: DeclarationId(2033),
+                        ty: DeclarationId(2036),
                     },
                 ],
             },
@@ -27487,11 +27499,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Miss".to_string(),
-                        ty: DeclarationId(2036),
+                        ty: DeclarationId(2039),
                     },
                     Field {
                         label: "Hit".to_string(),
-                        ty: DeclarationId(2037),
+                        ty: DeclarationId(2040),
                     },
                 ],
             },
@@ -27524,7 +27536,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("miss_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2034),
+                output: DeclarationId(2037),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4589, 4599)),
             },
             type_params: vec![],
@@ -27542,7 +27554,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("hit_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2035),
+                output: DeclarationId(2038),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4642, 4654)),
             },
             type_params: vec![],
@@ -27583,7 +27595,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[*{left}, *{right}]".to_string(),
                             ))],
@@ -27596,7 +27608,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -27638,7 +27650,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -27651,7 +27663,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -27693,7 +27705,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "(len({recv}) == 0)".to_string(),
                             ))],
@@ -27706,7 +27718,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -27750,7 +27762,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "__v3_fold({recv}, {init}, {body})".to_string(),
                             ))],
@@ -27763,7 +27775,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -27789,7 +27801,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2038)),
+            meta_tag: Some(DeclarationId(2041)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -27808,7 +27820,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -27821,7 +27833,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -27841,7 +27853,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg}.join({recv})".to_string(),
                             ))],
@@ -27854,7 +27866,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -27874,7 +27886,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}.split({arg})".to_string(),
                             ))],
@@ -27887,7 +27899,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -27909,7 +27921,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[-1] if {recv} else None".to_string(),
                             ))],
@@ -27922,7 +27934,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -27944,7 +27956,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[0] if {recv} else None".to_string(),
                             ))],
@@ -27957,7 +27969,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -27979,7 +27991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "list(enumerate({recv}))".to_string(),
                             ))],
@@ -27992,7 +28004,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -28014,7 +28026,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[ord(c) for c in {recv}]".to_string(),
                             ))],
@@ -28027,7 +28039,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -28049,7 +28061,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[{arg}(x) for x in {recv}]".to_string(),
                             ))],
@@ -28062,7 +28074,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -28084,7 +28096,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[x for x in {recv} if {arg}(x)]".to_string(),
                             ))],
@@ -28097,7 +28109,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -28119,7 +28131,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "any({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -28132,7 +28144,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -28154,7 +28166,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "all({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -28167,7 +28179,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -28189,7 +28201,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[y for x in {recv} for y in {arg}(x)]".to_string(),
                             ))],
@@ -28202,7 +28214,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -28222,7 +28234,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -28235,7 +28247,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -28255,7 +28267,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -28268,7 +28280,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -28290,7 +28302,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "sorted({recv}, key={arg})".to_string(),
                             ))],
@@ -28303,7 +28315,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -28323,7 +28335,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv} + [{arg}]".to_string(),
                             ))],
@@ -28336,7 +28348,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -28356,7 +28368,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg} in {recv}".to_string(),
                             ))],
@@ -28369,7 +28381,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -28467,23 +28479,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LiteralValue".to_string(),
-                        ty: DeclarationId(2039),
+                        ty: DeclarationId(2042),
                     },
                     Field {
                         label: "RecordValue".to_string(),
-                        ty: DeclarationId(2041),
+                        ty: DeclarationId(2044),
                     },
                     Field {
                         label: "VariantValue".to_string(),
-                        ty: DeclarationId(2042),
+                        ty: DeclarationId(2045),
                     },
                     Field {
                         label: "NodeRef".to_string(),
-                        ty: DeclarationId(2043),
+                        ty: DeclarationId(2046),
                     },
                     Field {
                         label: "CardinalityValue".to_string(),
-                        ty: DeclarationId(2044),
+                        ty: DeclarationId(2047),
                     },
                 ],
             },
@@ -28536,7 +28548,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bindings".to_string(),
-                    ty: DeclarationId(2045),
+                    ty: DeclarationId(2048),
                 }],
             },
             type_params: vec![],
@@ -28555,7 +28567,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "frames".to_string(),
-                    ty: DeclarationId(2046),
+                    ty: DeclarationId(2049),
                 }],
             },
             type_params: vec![],
@@ -28593,7 +28605,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "ApplicativeOrder".to_string(),
-                    ty: DeclarationId(2047),
+                    ty: DeclarationId(2050),
                 }],
             },
             type_params: vec![],
@@ -28612,7 +28624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LeftFirst".to_string(),
-                    ty: DeclarationId(2048),
+                    ty: DeclarationId(2051),
                 }],
             },
             type_params: vec![],
@@ -28658,7 +28670,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/runtime.dag", 6042, 6153),
         });
-        declarations.push(Declaration { id: DeclarationId(1033), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(607), arguments: vec![TemplateArgument { parameter: DeclarationId(608), value: DeclarationId(946) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2049)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1987), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1986), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(238)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1987), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1986), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1987), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1986), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(240)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1987), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1986), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1987), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1986), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1987), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1986), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1987), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1986), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1988), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1986), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1988), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1986), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1988), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1986), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1988), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1986), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(260)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1987), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1986), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(266)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1987), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1986), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) });
+        declarations.push(Declaration { id: DeclarationId(1033), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(607), arguments: vec![TemplateArgument { parameter: DeclarationId(608), value: DeclarationId(946) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2052)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1990), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1989), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(238)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1990), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1989), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1990), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1989), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(240)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1990), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1989), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1990), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1989), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1990), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1989), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1990), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1989), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1991), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1989), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1991), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1989), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1991), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1989), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1991), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1989), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(260)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1990), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1989), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(266)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1990), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1989), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) });
         declarations.push(Declaration {
             id: DeclarationId(1034),
             name: Some("InputField".to_string()),
@@ -28728,7 +28740,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2050),
+                        ty: DeclarationId(2053),
                     },
                     Field {
                         label: "endpoint".to_string(),
@@ -28753,15 +28765,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Strict".to_string(),
-                        ty: DeclarationId(2058),
+                        ty: DeclarationId(2061),
                     },
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2059),
+                        ty: DeclarationId(2062),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2060),
+                        ty: DeclarationId(2063),
                     },
                 ],
             },
@@ -28859,8 +28871,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1043),
             name: Some("optional_evidence_meet".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2051), DeclarationId(2052)],
-                output: DeclarationId(2053),
+                inputs: vec![DeclarationId(2054), DeclarationId(2055)],
+                output: DeclarationId(2056),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2388,
@@ -28881,8 +28893,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1044),
             name: Some("map_evidence_merge_at".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2054), DeclarationId(197), DeclarationId(1038)],
-                output: DeclarationId(2055),
+                inputs: vec![DeclarationId(2057), DeclarationId(197), DeclarationId(1038)],
+                output: DeclarationId(2058),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2733,
@@ -28906,23 +28918,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2061),
+                        ty: DeclarationId(2064),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2062),
+                        ty: DeclarationId(2065),
                     },
                     Field {
                         label: "ArithmeticValue".to_string(),
-                        ty: DeclarationId(2063),
+                        ty: DeclarationId(2066),
                     },
                     Field {
                         label: "TokenPosition".to_string(),
-                        ty: DeclarationId(2064),
+                        ty: DeclarationId(2067),
                     },
                     Field {
                         label: "SetCardinality".to_string(),
-                        ty: DeclarationId(2065),
+                        ty: DeclarationId(2068),
                     },
                 ],
             },
@@ -28943,11 +28955,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "OneStep".to_string(),
-                        ty: DeclarationId(2066),
+                        ty: DeclarationId(2069),
                     },
                     Field {
                         label: "AdditionalStep".to_string(),
-                        ty: DeclarationId(2067),
+                        ty: DeclarationId(2070),
                     },
                 ],
             },
@@ -28968,11 +28980,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DivideByTwo".to_string(),
-                        ty: DeclarationId(2068),
+                        ty: DeclarationId(2071),
                     },
                     Field {
                         label: "StrictlyLarger".to_string(),
-                        ty: DeclarationId(2069),
+                        ty: DeclarationId(2072),
                     },
                 ],
             },
@@ -29035,7 +29047,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("positive_descent_amount_from_positive_int".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2056),
+                output: DeclarationId(2059),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     5902,
@@ -29057,7 +29069,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("proportional_divisor_from_int_at_least_two".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2057),
+                output: DeclarationId(2060),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6342,
@@ -29081,31 +29093,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ChildAccessor".to_string(),
-                        ty: DeclarationId(2070),
+                        ty: DeclarationId(2073),
                     },
                     Field {
                         label: "ListShrink".to_string(),
-                        ty: DeclarationId(2071),
+                        ty: DeclarationId(2074),
                     },
                     Field {
                         label: "ArithmeticSubtractDescent".to_string(),
-                        ty: DeclarationId(2072),
+                        ty: DeclarationId(2075),
                     },
                     Field {
                         label: "ArithmeticDivideDescent".to_string(),
-                        ty: DeclarationId(2073),
+                        ty: DeclarationId(2076),
                     },
                     Field {
                         label: "ParserAdvance".to_string(),
-                        ty: DeclarationId(2074),
+                        ty: DeclarationId(2077),
                     },
                     Field {
                         label: "SetRemoval".to_string(),
-                        ty: DeclarationId(2075),
+                        ty: DeclarationId(2078),
                     },
                     Field {
                         label: "FoldIteration".to_string(),
-                        ty: DeclarationId(2076),
+                        ty: DeclarationId(2079),
                     },
                 ],
             },
@@ -29125,7 +29137,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "dimensions".to_string(),
-                    ty: DeclarationId(2077),
+                    ty: DeclarationId(2080),
                 }],
             },
             type_params: vec![],
@@ -29153,7 +29165,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(2078),
+                        ty: DeclarationId(2081),
                     },
                 ],
             },
@@ -29174,187 +29186,187 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2079),
+                        ty: DeclarationId(2082),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2080),
+                        ty: DeclarationId(2083),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2081),
+                        ty: DeclarationId(2084),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2082),
+                        ty: DeclarationId(2085),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2083),
+                        ty: DeclarationId(2086),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2084),
+                        ty: DeclarationId(2087),
                     },
                     Field {
                         label: "KwService".to_string(),
-                        ty: DeclarationId(2085),
+                        ty: DeclarationId(2088),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2086),
+                        ty: DeclarationId(2089),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2087),
+                        ty: DeclarationId(2090),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2088),
+                        ty: DeclarationId(2091),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2089),
+                        ty: DeclarationId(2092),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2090),
+                        ty: DeclarationId(2093),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2091),
+                        ty: DeclarationId(2094),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2092),
+                        ty: DeclarationId(2095),
                     },
                     Field {
                         label: "Ident".to_string(),
-                        ty: DeclarationId(2093),
+                        ty: DeclarationId(2096),
                     },
                     Field {
                         label: "IntLit".to_string(),
-                        ty: DeclarationId(2094),
+                        ty: DeclarationId(2097),
                     },
                     Field {
                         label: "StringLit".to_string(),
-                        ty: DeclarationId(2095),
+                        ty: DeclarationId(2098),
                     },
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2096),
+                        ty: DeclarationId(2099),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2097),
+                        ty: DeclarationId(2100),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2098),
+                        ty: DeclarationId(2101),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2099),
+                        ty: DeclarationId(2102),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2100),
+                        ty: DeclarationId(2103),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2101),
+                        ty: DeclarationId(2104),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2102),
+                        ty: DeclarationId(2105),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2103),
+                        ty: DeclarationId(2106),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2104),
+                        ty: DeclarationId(2107),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2105),
+                        ty: DeclarationId(2108),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2106),
+                        ty: DeclarationId(2109),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2107),
+                        ty: DeclarationId(2110),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2108),
+                        ty: DeclarationId(2111),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2109),
+                        ty: DeclarationId(2112),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2110),
+                        ty: DeclarationId(2113),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2111),
+                        ty: DeclarationId(2114),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2112),
+                        ty: DeclarationId(2115),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2113),
+                        ty: DeclarationId(2116),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2114),
+                        ty: DeclarationId(2117),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2115),
+                        ty: DeclarationId(2118),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2116),
+                        ty: DeclarationId(2119),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2117),
+                        ty: DeclarationId(2120),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2118),
+                        ty: DeclarationId(2121),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2119),
+                        ty: DeclarationId(2122),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2120),
+                        ty: DeclarationId(2123),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2121),
+                        ty: DeclarationId(2124),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2122),
+                        ty: DeclarationId(2125),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2123),
+                        ty: DeclarationId(2126),
                     },
                     Field {
                         label: "Eof".to_string(),
-                        ty: DeclarationId(2124),
+                        ty: DeclarationId(2127),
                     },
                 ],
             },
@@ -29400,59 +29412,59 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2125),
+                        ty: DeclarationId(2128),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2126),
+                        ty: DeclarationId(2129),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2127),
+                        ty: DeclarationId(2130),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2128),
+                        ty: DeclarationId(2131),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2129),
+                        ty: DeclarationId(2132),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2130),
+                        ty: DeclarationId(2133),
                     },
                     Field {
                         label: "KwService".to_string(),
-                        ty: DeclarationId(2131),
+                        ty: DeclarationId(2134),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2132),
+                        ty: DeclarationId(2135),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2133),
+                        ty: DeclarationId(2136),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2134),
+                        ty: DeclarationId(2137),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2135),
+                        ty: DeclarationId(2138),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2136),
+                        ty: DeclarationId(2139),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2137),
+                        ty: DeclarationId(2140),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2138),
+                        ty: DeclarationId(2141),
                     },
                 ],
             },
@@ -29473,115 +29485,115 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2139),
+                        ty: DeclarationId(2142),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2140),
+                        ty: DeclarationId(2143),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2141),
+                        ty: DeclarationId(2144),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2142),
+                        ty: DeclarationId(2145),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2143),
+                        ty: DeclarationId(2146),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2144),
+                        ty: DeclarationId(2147),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2145),
+                        ty: DeclarationId(2148),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2146),
+                        ty: DeclarationId(2149),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2147),
+                        ty: DeclarationId(2150),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2148),
+                        ty: DeclarationId(2151),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2149),
+                        ty: DeclarationId(2152),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2150),
+                        ty: DeclarationId(2153),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2151),
+                        ty: DeclarationId(2154),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2152),
+                        ty: DeclarationId(2155),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2153),
+                        ty: DeclarationId(2156),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2154),
+                        ty: DeclarationId(2157),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2155),
+                        ty: DeclarationId(2158),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2156),
+                        ty: DeclarationId(2159),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2157),
+                        ty: DeclarationId(2160),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2158),
+                        ty: DeclarationId(2161),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2159),
+                        ty: DeclarationId(2162),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2160),
+                        ty: DeclarationId(2163),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2161),
+                        ty: DeclarationId(2164),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2162),
+                        ty: DeclarationId(2165),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2163),
+                        ty: DeclarationId(2166),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2164),
+                        ty: DeclarationId(2167),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2165),
+                        ty: DeclarationId(2168),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2166),
+                        ty: DeclarationId(2169),
                     },
                 ],
             },
@@ -29796,31 +29808,43 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2170),
+                        ty: DeclarationId(2173),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2171),
+                        ty: DeclarationId(2174),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2172),
+                        ty: DeclarationId(2175),
+                    },
+                    Field {
+                        label: "ArityMismatch".to_string(),
+                        ty: DeclarationId(2176),
+                    },
+                    Field {
+                        label: "ResolveError".to_string(),
+                        ty: DeclarationId(2177),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2173),
+                        ty: DeclarationId(2178),
                     },
                     Field {
-                        label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2174),
+                        label: "BranchConditionNotBool".to_string(),
+                        ty: DeclarationId(2179),
                     },
                     Field {
-                        label: "ResolveError".to_string(),
-                        ty: DeclarationId(2175),
+                        label: "MagnitudeOutOfRange".to_string(),
+                        ty: DeclarationId(2180),
+                    },
+                    Field {
+                        label: "MalformedIntegerRangeFact".to_string(),
+                        ty: DeclarationId(2181),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2176),
+                        ty: DeclarationId(2182),
                     },
                 ],
             },
@@ -29832,7 +29856,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2456, 2606),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2456, 2687),
         });
         declarations.push(Declaration {
             id: DeclarationId(1071),
@@ -29841,11 +29865,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "AnyDetail".to_string(),
-                        ty: DeclarationId(2177),
+                        ty: DeclarationId(2183),
                     },
                     Field {
                         label: "Contains".to_string(),
-                        ty: DeclarationId(2178),
+                        ty: DeclarationId(2184),
                     },
                 ],
             },
@@ -29857,7 +29881,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2975, 3042),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3056, 3123),
         });
         declarations.push(Declaration {
             id: DeclarationId(1072),
@@ -29882,7 +29906,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3186, 3284),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3267, 3365),
         });
         declarations.push(Declaration {
             id: DeclarationId(1073),
@@ -29891,11 +29915,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(2179),
+                        ty: DeclarationId(2185),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(2180),
+                        ty: DeclarationId(2186),
                     },
                 ],
             },
@@ -29907,7 +29931,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3671, 3724),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3752, 3805),
         });
         declarations.push(Declaration {
             id: DeclarationId(1074),
@@ -29916,15 +29940,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Associativity".to_string(),
-                        ty: DeclarationId(2181),
+                        ty: DeclarationId(2187),
                     },
                     Field {
                         label: "Commutativity".to_string(),
-                        ty: DeclarationId(2182),
+                        ty: DeclarationId(2188),
                     },
                     Field {
                         label: "Identity".to_string(),
-                        ty: DeclarationId(2183),
+                        ty: DeclarationId(2189),
                     },
                 ],
             },
@@ -29936,7 +29960,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4513, 4583),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4594, 4664),
         });
         declarations.push(Declaration {
             id: DeclarationId(1075),
@@ -29945,91 +29969,91 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Compiles".to_string(),
-                        ty: DeclarationId(2184),
+                        ty: DeclarationId(2190),
                     },
                     Field {
                         label: "FailsWithDiagnostic".to_string(),
-                        ty: DeclarationId(2185),
+                        ty: DeclarationId(2191),
                     },
                     Field {
                         label: "OutputEquals".to_string(),
-                        ty: DeclarationId(2186),
+                        ty: DeclarationId(2192),
                     },
                     Field {
                         label: "PortHasState".to_string(),
-                        ty: DeclarationId(2187),
+                        ty: DeclarationId(2193),
                     },
                     Field {
                         label: "DeclarationHasRefinement".to_string(),
-                        ty: DeclarationId(2188),
+                        ty: DeclarationId(2194),
                     },
                     Field {
                         label: "CostBounded".to_string(),
-                        ty: DeclarationId(2189),
+                        ty: DeclarationId(2195),
                     },
                     Field {
                         label: "BehavioralObservation".to_string(),
-                        ty: DeclarationId(2190),
+                        ty: DeclarationId(2196),
                     },
                     Field {
                         label: "MockBackedInvariant".to_string(),
-                        ty: DeclarationId(2191),
+                        ty: DeclarationId(2197),
                     },
                     Field {
                         label: "ExecuteCommand".to_string(),
-                        ty: DeclarationId(2193),
+                        ty: DeclarationId(2199),
                     },
                     Field {
                         label: "ForAllTargets".to_string(),
-                        ty: DeclarationId(2195),
+                        ty: DeclarationId(2201),
                     },
                     Field {
                         label: "LensOutputEquals".to_string(),
-                        ty: DeclarationId(2196),
+                        ty: DeclarationId(2202),
                     },
                     Field {
                         label: "DifferentialEquals".to_string(),
-                        ty: DeclarationId(2197),
+                        ty: DeclarationId(2203),
                     },
                     Field {
                         label: "BinaryDimensionReportEquals".to_string(),
-                        ty: DeclarationId(2198),
+                        ty: DeclarationId(2204),
                     },
                     Field {
                         label: "AlgebraicLaw".to_string(),
-                        ty: DeclarationId(2199),
+                        ty: DeclarationId(2205),
                     },
                     Field {
                         label: "CensusBoundCheck".to_string(),
-                        ty: DeclarationId(2200),
+                        ty: DeclarationId(2206),
                     },
                     Field {
                         label: "CensusSubsetCount".to_string(),
-                        ty: DeclarationId(2201),
+                        ty: DeclarationId(2207),
                     },
                     Field {
                         label: "FixedPointConverges".to_string(),
-                        ty: DeclarationId(2202),
+                        ty: DeclarationId(2208),
                     },
                     Field {
                         label: "RatchetZero".to_string(),
-                        ty: DeclarationId(2203),
+                        ty: DeclarationId(2209),
                     },
                     Field {
                         label: "GeneratedFromDag".to_string(),
-                        ty: DeclarationId(2205),
+                        ty: DeclarationId(2211),
                     },
                     Field {
                         label: "ReleaseDeferredClaim".to_string(),
-                        ty: DeclarationId(2206),
+                        ty: DeclarationId(2212),
                     },
                     Field {
                         label: "SubstrateResearchDeferredClaim".to_string(),
-                        ty: DeclarationId(2207),
+                        ty: DeclarationId(2213),
                     },
                     Field {
                         label: "BridgeLedgerZero".to_string(),
-                        ty: DeclarationId(2208),
+                        ty: DeclarationId(2214),
                     },
                 ],
             },
@@ -30041,7 +30065,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4585, 12806),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4666, 12887),
         });
         declarations.push(Declaration {
             id: DeclarationId(1076),
@@ -30055,7 +30079,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12914, 12934),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12995, 13015),
         });
         declarations.push(Declaration {
             id: DeclarationId(1077),
@@ -30074,7 +30098,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 13077, 13132),
+            span: SourceSpan::new("src/v3/std/verification.dag", 13158, 13213),
         });
         declarations.push(Declaration {
             id: DeclarationId(1078),
@@ -30099,7 +30123,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2209),
+                        ty: DeclarationId(2215),
                     },
                 ],
             },
@@ -30111,7 +30135,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 13742, 13875),
+            span: SourceSpan::new("src/v3/std/verification.dag", 13823, 13956),
         });
         declarations.push(Declaration {
             id: DeclarationId(1079),
@@ -30124,7 +30148,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "claims".to_string(),
-                        ty: DeclarationId(2210),
+                        ty: DeclarationId(2216),
                     },
                 ],
             },
@@ -30136,7 +30160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 13877, 13936),
+            span: SourceSpan::new("src/v3/std/verification.dag", 13958, 14017),
         });
         declarations.push(Declaration {
             id: DeclarationId(1080),
@@ -30149,7 +30173,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "resources".to_string(),
-                        ty: DeclarationId(2211),
+                        ty: DeclarationId(2217),
                     },
                 ],
             },
@@ -30161,18 +30185,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 14134, 14215),
+            span: SourceSpan::new("src/v3/std/verification.dag", 14215, 14296),
         });
         declarations.push(Declaration {
             id: DeclarationId(1081),
             name: Some("claim_obligation_resources".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1078)],
-                output: DeclarationId(2167),
+                output: DeclarationId(2170),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    14657,
-                    14673,
+                    14738,
+                    14754,
                 )),
             },
             type_params: vec![],
@@ -30183,7 +30207,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 14586, 14673),
+            span: SourceSpan::new("src/v3/std/verification.dag", 14667, 14754),
         });
         declarations.push(Declaration {
             id: DeclarationId(1082),
@@ -30193,8 +30217,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 output: DeclarationId(1080),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    14731,
-                    14816,
+                    14812,
+                    14897,
                 )),
             },
             type_params: vec![],
@@ -30205,18 +30229,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 14675, 14816),
+            span: SourceSpan::new("src/v3/std/verification.dag", 14756, 14897),
         });
         declarations.push(Declaration {
             id: DeclarationId(1083),
             name: Some("materialize_test_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2168)],
-                output: DeclarationId(2169),
+                inputs: vec![DeclarationId(2171)],
+                output: DeclarationId(2172),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    14899,
-                    14938,
+                    14980,
+                    15019,
                 )),
             },
             type_params: vec![],
@@ -30227,14 +30251,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 14818, 14938),
+            span: SourceSpan::new("src/v3/std/verification.dag", 14899, 15019),
         });
         declarations.push(Declaration {
             id: DeclarationId(1084),
             name: Some("behavior_spine".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(748)],
-                output: DeclarationId(2212),
+                output: DeclarationId(2218),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(280))),
             },
             type_params: vec![],
@@ -30535,7 +30559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1955),
+                            constructor: DeclarationId(1958),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1607),
                                 payload: vec![
@@ -30831,7 +30855,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1956),
+                                    constructor: DeclarationId(1959),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -30929,7 +30953,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -30948,7 +30972,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state".to_string(),
                                         ))],
@@ -30969,7 +30993,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -31030,7 +31054,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -31049,7 +31073,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -31068,7 +31092,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -31359,7 +31383,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -31378,7 +31402,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -31441,7 +31465,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -31460,7 +31484,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -31523,7 +31547,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -31542,7 +31566,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -31604,7 +31628,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1956),
+                                    constructor: DeclarationId(1959),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -31664,7 +31688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -31683,7 +31707,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -31744,7 +31768,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -31763,7 +31787,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -31824,7 +31848,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -31843,7 +31867,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -31862,7 +31886,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -31923,7 +31947,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1957),
+                                        constructor: DeclarationId(1960),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -31942,7 +31966,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1957),
+                                        constructor: DeclarationId(1960),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -32002,7 +32026,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1957),
+                                    constructor: DeclarationId(1960),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -32061,7 +32085,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1956),
+                                    constructor: DeclarationId(1959),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -32120,7 +32144,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1956),
+                                    constructor: DeclarationId(1959),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -32180,7 +32204,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -32201,7 +32225,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -32414,7 +32438,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -32433,7 +32457,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -32454,7 +32478,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -32475,7 +32499,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -32496,7 +32520,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -32517,7 +32541,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -32538,7 +32562,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -32559,7 +32583,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -32580,7 +32604,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -32599,7 +32623,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -32890,7 +32914,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -32911,7 +32935,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -32972,7 +32996,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -32993,7 +33017,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33012,7 +33036,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -33031,7 +33055,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -33130,7 +33154,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33149,7 +33173,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -33170,7 +33194,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33189,7 +33213,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33250,7 +33274,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33269,7 +33293,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -33288,7 +33312,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -33309,7 +33333,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33328,7 +33352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33389,7 +33413,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33408,7 +33432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -33427,7 +33451,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -33448,7 +33472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33467,7 +33491,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33488,7 +33512,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -33549,7 +33573,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33568,7 +33592,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -33587,7 +33611,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -33606,7 +33630,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -33625,7 +33649,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -33646,7 +33670,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33665,7 +33689,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33726,7 +33750,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33745,7 +33769,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -33766,7 +33790,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33785,7 +33809,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -33804,7 +33828,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33825,7 +33849,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -33926,7 +33950,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -33945,7 +33969,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -33964,7 +33988,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -33985,7 +34009,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -35043,7 +35067,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -35080,7 +35104,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1973),
                             payload: vec![],
                         },
                     ),
@@ -35091,7 +35115,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1960),
+                                    constructor: DeclarationId(1963),
                                     payload: vec![],
                                 },
                             ),
@@ -35129,7 +35153,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -35141,7 +35165,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1960),
+                                        constructor: DeclarationId(1963),
                                         payload: vec![],
                                     },
                                 ),
@@ -35151,7 +35175,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1960),
+                                        constructor: DeclarationId(1963),
                                         payload: vec![],
                                     },
                                 ),
@@ -35190,7 +35214,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1972),
+                            constructor: DeclarationId(1975),
                             payload: vec![],
                         },
                     ),
@@ -35202,7 +35226,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1960),
+                                        constructor: DeclarationId(1963),
                                         payload: vec![],
                                     },
                                 ),
@@ -35212,7 +35236,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1960),
+                                        constructor: DeclarationId(1963),
                                         payload: vec![],
                                     },
                                 ),
@@ -35251,7 +35275,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1976),
                             payload: vec![],
                         },
                     ),
@@ -35262,7 +35286,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1959),
+                                    constructor: DeclarationId(1962),
                                     payload: vec![],
                                 },
                             ),
@@ -35401,7 +35425,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1977),
                             payload: vec![],
                         },
                     ),
@@ -35412,7 +35436,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1959),
+                                    constructor: DeclarationId(1962),
                                     payload: vec![],
                                 },
                             ),
@@ -35450,7 +35474,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1975),
+                            constructor: DeclarationId(1978),
                             payload: vec![],
                         },
                     ),
@@ -35462,7 +35486,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -35472,7 +35496,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1960),
+                                        constructor: DeclarationId(1963),
                                         payload: vec![],
                                     },
                                 ),
@@ -35482,7 +35506,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -35521,7 +35545,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1976),
+                            constructor: DeclarationId(1979),
                             payload: vec![],
                         },
                     ),
@@ -35533,7 +35557,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -35543,7 +35567,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -35582,7 +35606,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1977),
+                            constructor: DeclarationId(1980),
                             payload: vec![],
                         },
                     ),
@@ -35594,7 +35618,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -35604,7 +35628,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -35643,7 +35667,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1978),
+                            constructor: DeclarationId(1981),
                             payload: vec![],
                         },
                     ),
@@ -35655,7 +35679,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -35665,7 +35689,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -35704,7 +35728,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1980),
+                            constructor: DeclarationId(1983),
                             payload: vec![],
                         },
                     ),
@@ -37132,7 +37156,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1955),
+                            constructor: DeclarationId(1958),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1607),
                                 payload: vec![
@@ -37189,7 +37213,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1955),
+                            constructor: DeclarationId(1958),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1608),
                                 payload: vec![],
@@ -38645,7 +38669,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -38682,7 +38706,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1973),
                             payload: vec![],
                         },
                     ),
@@ -38693,7 +38717,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1960),
+                                    constructor: DeclarationId(1963),
                                     payload: vec![],
                                 },
                             ),
@@ -38731,7 +38755,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -38743,7 +38767,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1960),
+                                        constructor: DeclarationId(1963),
                                         payload: vec![],
                                     },
                                 ),
@@ -38753,7 +38777,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1960),
+                                        constructor: DeclarationId(1963),
                                         payload: vec![],
                                     },
                                 ),
@@ -38792,7 +38816,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1972),
+                            constructor: DeclarationId(1975),
                             payload: vec![],
                         },
                     ),
@@ -38804,7 +38828,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1960),
+                                        constructor: DeclarationId(1963),
                                         payload: vec![],
                                     },
                                 ),
@@ -38814,7 +38838,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1960),
+                                        constructor: DeclarationId(1963),
                                         payload: vec![],
                                     },
                                 ),
@@ -38853,7 +38877,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1976),
                             payload: vec![],
                         },
                     ),
@@ -38864,7 +38888,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1959),
+                                    constructor: DeclarationId(1962),
                                     payload: vec![],
                                 },
                             ),
@@ -38902,7 +38926,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1977),
                             payload: vec![],
                         },
                     ),
@@ -38913,7 +38937,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1959),
+                                    constructor: DeclarationId(1962),
                                     payload: vec![],
                                 },
                             ),
@@ -38951,7 +38975,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1975),
+                            constructor: DeclarationId(1978),
                             payload: vec![],
                         },
                     ),
@@ -38963,7 +38987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -38973,7 +38997,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1960),
+                                        constructor: DeclarationId(1963),
                                         payload: vec![],
                                     },
                                 ),
@@ -38983,7 +39007,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -39022,7 +39046,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1976),
+                            constructor: DeclarationId(1979),
                             payload: vec![],
                         },
                     ),
@@ -39034,7 +39058,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -39044,7 +39068,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -39083,7 +39107,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1977),
+                            constructor: DeclarationId(1980),
                             payload: vec![],
                         },
                     ),
@@ -39095,7 +39119,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -39105,7 +39129,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -39144,7 +39168,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1978),
+                            constructor: DeclarationId(1981),
                             payload: vec![],
                         },
                     ),
@@ -39156,7 +39180,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -39166,7 +39190,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -39309,7 +39333,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1980),
+                            constructor: DeclarationId(1983),
                             payload: vec![],
                         },
                     ),
@@ -39822,7 +39846,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1955),
+                            constructor: DeclarationId(1958),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1607),
                                 payload: vec![
@@ -39879,7 +39903,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1955),
+                            constructor: DeclarationId(1958),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1607),
                                 payload: vec![
@@ -39936,7 +39960,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1954),
+                            constructor: DeclarationId(1957),
                             payload: vec![],
                         },
                     ),
@@ -39979,7 +40003,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1954),
+                            constructor: DeclarationId(1957),
                             payload: vec![],
                         },
                     ),
@@ -40022,7 +40046,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1954),
+                            constructor: DeclarationId(1957),
                             payload: vec![],
                         },
                     ),
@@ -40304,7 +40328,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1956),
+                                    constructor: DeclarationId(1959),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -40402,7 +40426,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1957),
+                                        constructor: DeclarationId(1960),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -40421,7 +40445,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1957),
+                                        constructor: DeclarationId(1960),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state_value".to_string(),
                                         ))],
@@ -40442,7 +40466,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -40503,7 +40527,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -40522,7 +40546,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -40541,7 +40565,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -40832,7 +40856,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -40851,7 +40875,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -40914,7 +40938,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -40933,7 +40957,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -40996,7 +41020,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -41015,7 +41039,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -41077,7 +41101,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1956),
+                                    constructor: DeclarationId(1959),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -41139,7 +41163,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "0".to_string(),
                                         ))],
@@ -41158,7 +41182,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "1".to_string(),
                                         ))],
@@ -41219,7 +41243,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -41238,7 +41262,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -41299,7 +41323,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -41318,7 +41342,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -41337,7 +41361,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -41397,7 +41421,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1957),
+                                    constructor: DeclarationId(1960),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "index_of".to_string(),
                                     ))],
@@ -41457,7 +41481,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1957),
+                                        constructor: DeclarationId(1960),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -41476,7 +41500,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1957),
+                                        constructor: DeclarationId(1960),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -41536,7 +41560,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1957),
+                                    constructor: DeclarationId(1960),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -41595,7 +41619,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1956),
+                                    constructor: DeclarationId(1959),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -41654,7 +41678,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1956),
+                                    constructor: DeclarationId(1959),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -41714,7 +41738,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -41735,7 +41759,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -41948,7 +41972,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -41967,7 +41991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -41988,7 +42012,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -42009,7 +42033,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -42030,7 +42054,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -42051,7 +42075,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -42072,7 +42096,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -42093,7 +42117,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -42114,7 +42138,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -42133,7 +42157,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -42424,7 +42448,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -42445,7 +42469,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -42506,7 +42530,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -42527,7 +42551,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1957),
+                                        constructor: DeclarationId(1960),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -42546,7 +42570,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -42565,7 +42589,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -42664,7 +42688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -42683,7 +42707,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "data".to_string(),
                                         ))],
@@ -42704,7 +42728,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1957),
+                                        constructor: DeclarationId(1960),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -42723,7 +42747,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -42744,7 +42768,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1957),
+                                        constructor: DeclarationId(1960),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -42805,7 +42829,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -42824,7 +42848,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -42843,7 +42867,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -42864,7 +42888,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1957),
+                                        constructor: DeclarationId(1960),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -42883,7 +42907,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -42944,7 +42968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -42963,7 +42987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -42982,7 +43006,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -43003,7 +43027,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1957),
+                                        constructor: DeclarationId(1960),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -43022,7 +43046,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -43043,7 +43067,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1957),
+                                        constructor: DeclarationId(1960),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -43104,7 +43128,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -43123,7 +43147,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -43142,7 +43166,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -43161,7 +43185,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -43180,7 +43204,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -43201,7 +43225,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1957),
+                                        constructor: DeclarationId(1960),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -43220,7 +43244,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -43281,7 +43305,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -43300,7 +43324,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -43321,7 +43345,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1957),
+                                        constructor: DeclarationId(1960),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -43340,7 +43364,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -43359,7 +43383,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1956),
+                                        constructor: DeclarationId(1959),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -43380,7 +43404,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1957),
+                                        constructor: DeclarationId(1960),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -43401,7 +43425,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1957),
+                                        constructor: DeclarationId(1960),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -43502,7 +43526,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1957),
+                                        constructor: DeclarationId(1960),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -43521,7 +43545,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1957),
+                                        constructor: DeclarationId(1960),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -43540,7 +43564,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1957),
+                                        constructor: DeclarationId(1960),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -43561,7 +43585,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1957),
+                                        constructor: DeclarationId(1960),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -44654,7 +44678,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -44691,7 +44715,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1973),
                             payload: vec![],
                         },
                     ),
@@ -44702,7 +44726,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1960),
+                                    constructor: DeclarationId(1963),
                                     payload: vec![],
                                 },
                             ),
@@ -44740,7 +44764,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -44752,7 +44776,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1960),
+                                        constructor: DeclarationId(1963),
                                         payload: vec![],
                                     },
                                 ),
@@ -44762,7 +44786,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1960),
+                                        constructor: DeclarationId(1963),
                                         payload: vec![],
                                     },
                                 ),
@@ -44801,7 +44825,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1972),
+                            constructor: DeclarationId(1975),
                             payload: vec![],
                         },
                     ),
@@ -44813,7 +44837,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1960),
+                                        constructor: DeclarationId(1963),
                                         payload: vec![],
                                     },
                                 ),
@@ -44823,7 +44847,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1960),
+                                        constructor: DeclarationId(1963),
                                         payload: vec![],
                                     },
                                 ),
@@ -44862,7 +44886,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1976),
                             payload: vec![],
                         },
                     ),
@@ -44873,7 +44897,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1959),
+                                    constructor: DeclarationId(1962),
                                     payload: vec![],
                                 },
                             ),
@@ -45047,7 +45071,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1977),
                             payload: vec![],
                         },
                     ),
@@ -45058,7 +45082,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1959),
+                                    constructor: DeclarationId(1962),
                                     payload: vec![],
                                 },
                             ),
@@ -45096,7 +45120,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1975),
+                            constructor: DeclarationId(1978),
                             payload: vec![],
                         },
                     ),
@@ -45108,7 +45132,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -45118,7 +45142,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1960),
+                                        constructor: DeclarationId(1963),
                                         payload: vec![],
                                     },
                                 ),
@@ -45128,7 +45152,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -45167,7 +45191,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1976),
+                            constructor: DeclarationId(1979),
                             payload: vec![],
                         },
                     ),
@@ -45179,7 +45203,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -45189,7 +45213,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -45228,7 +45252,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1977),
+                            constructor: DeclarationId(1980),
                             payload: vec![],
                         },
                     ),
@@ -45240,7 +45264,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -45250,7 +45274,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -45289,7 +45313,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1978),
+                            constructor: DeclarationId(1981),
                             payload: vec![],
                         },
                     ),
@@ -45301,7 +45325,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -45311,7 +45335,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1959),
+                                        constructor: DeclarationId(1962),
                                         payload: vec![],
                                     },
                                 ),
@@ -45350,7 +45374,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1980),
+                            constructor: DeclarationId(1983),
                             payload: vec![],
                         },
                     ),
@@ -45791,7 +45815,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{ let mut __left = {left}; __left.extend({right}); __left }"
                                     .to_string(),
@@ -45805,7 +45829,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -45845,7 +45869,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).len() as i64".to_string(),
                             ))],
@@ -45858,7 +45882,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -45896,7 +45920,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).is_empty()".to_string(),
                             ))],
@@ -45909,7 +45933,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -45949,7 +45973,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1987),
+                            constructor: DeclarationId(1990),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().fold({init}, {body})".to_string(),
                             ))],
@@ -45962,7 +45986,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1986),
+                            constructor: DeclarationId(1989),
                             payload: vec![],
                         },
                     ),
@@ -46034,14 +46058,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "read".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1981),
+                            constructor: DeclarationId(1984),
                             payload: vec![],
                         },
                     ),
                     (
                         "construct".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1983),
+                            constructor: DeclarationId(1986),
                             payload: vec![],
                         },
                     ),
@@ -46692,15 +46716,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SnapshotSurface".to_string(),
-                        ty: DeclarationId(2213),
+                        ty: DeclarationId(2219),
                     },
                     Field {
                         label: "SnapshotDag".to_string(),
-                        ty: DeclarationId(2214),
+                        ty: DeclarationId(2220),
                     },
                     Field {
                         label: "SnapshotText".to_string(),
-                        ty: DeclarationId(2215),
+                        ty: DeclarationId(2221),
                     },
                 ],
             },
@@ -46916,7 +46940,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2213),
+                            constructor: DeclarationId(2219),
                             payload: vec![],
                         },
                     ),
@@ -46951,7 +46975,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2214),
+                            constructor: DeclarationId(2220),
                             payload: vec![],
                         },
                     ),
@@ -46986,7 +47010,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2214),
+                            constructor: DeclarationId(2220),
                             payload: vec![],
                         },
                     ),
@@ -47021,7 +47045,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2214),
+                            constructor: DeclarationId(2220),
                             payload: vec![],
                         },
                     ),
@@ -47056,7 +47080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2214),
+                            constructor: DeclarationId(2220),
                             payload: vec![],
                         },
                     ),
@@ -47091,7 +47115,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2215),
+                            constructor: DeclarationId(2221),
                             payload: vec![],
                         },
                     ),
@@ -47241,7 +47265,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("from_symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(2216),
+                output: DeclarationId(2222),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/operators.dag",
                     156,
@@ -47657,11 +47681,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "OrderedRingAlgebra".to_string(),
-                        ty: DeclarationId(2217),
+                        ty: DeclarationId(2223),
                     },
                     Field {
                         label: "SemiringAlgebra".to_string(),
-                        ty: DeclarationId(2218),
+                        ty: DeclarationId(2224),
                     },
                 ],
             },
@@ -47682,11 +47706,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "BooleanAlgebraAlgebra".to_string(),
-                        ty: DeclarationId(2219),
+                        ty: DeclarationId(2225),
                     },
                     Field {
                         label: "TerminalAlgebra".to_string(),
-                        ty: DeclarationId(2220),
+                        ty: DeclarationId(2226),
                     },
                 ],
             },
@@ -47707,31 +47731,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "BitCarrier".to_string(),
-                        ty: DeclarationId(2221),
+                        ty: DeclarationId(2227),
                     },
                     Field {
                         label: "ByteCarrier".to_string(),
-                        ty: DeclarationId(2222),
+                        ty: DeclarationId(2228),
                     },
                     Field {
                         label: "Word16Carrier".to_string(),
-                        ty: DeclarationId(2223),
+                        ty: DeclarationId(2229),
                     },
                     Field {
                         label: "Word32Carrier".to_string(),
-                        ty: DeclarationId(2224),
+                        ty: DeclarationId(2230),
                     },
                     Field {
                         label: "Word64Carrier".to_string(),
-                        ty: DeclarationId(2225),
+                        ty: DeclarationId(2231),
                     },
                     Field {
                         label: "Word128Carrier".to_string(),
-                        ty: DeclarationId(2226),
+                        ty: DeclarationId(2232),
                     },
                     Field {
                         label: "TerminalCarrier".to_string(),
-                        ty: DeclarationId(2227),
+                        ty: DeclarationId(2233),
                     },
                 ],
             },
@@ -47752,15 +47776,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TwoComplementWrap".to_string(),
-                        ty: DeclarationId(2228),
+                        ty: DeclarationId(2234),
                     },
                     Field {
                         label: "Saturating".to_string(),
-                        ty: DeclarationId(2229),
+                        ty: DeclarationId(2235),
                     },
                     Field {
                         label: "Trap".to_string(),
-                        ty: DeclarationId(2230),
+                        ty: DeclarationId(2236),
                     },
                 ],
             },
@@ -47781,11 +47805,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IntegerPrimitive".to_string(),
-                        ty: DeclarationId(2231),
+                        ty: DeclarationId(2237),
                     },
                     Field {
                         label: "NonIntegerPrimitive".to_string(),
-                        ty: DeclarationId(2232),
+                        ty: DeclarationId(2238),
                     },
                 ],
             },
@@ -47811,83 +47835,83 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2233)),
+            meta_tag: Some(DeclarationId(2239)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
                 FieldValue::Variant {
-                    constructor: DeclarationId(2231),
+                    constructor: DeclarationId(2237),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2217),
+                            constructor: DeclarationId(2223),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2222),
+                            constructor: DeclarationId(2228),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("-128".to_string())),
                         FieldValue::Literal(LiteralBits::String("127".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2228),
+                            constructor: DeclarationId(2234),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2231),
+                    constructor: DeclarationId(2237),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2217),
+                            constructor: DeclarationId(2223),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2223),
+                            constructor: DeclarationId(2229),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("-32768".to_string())),
                         FieldValue::Literal(LiteralBits::String("32767".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2228),
+                            constructor: DeclarationId(2234),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2231),
+                    constructor: DeclarationId(2237),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2217),
+                            constructor: DeclarationId(2223),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2224),
+                            constructor: DeclarationId(2230),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("-2147483648".to_string())),
                         FieldValue::Literal(LiteralBits::String("2147483647".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2228),
+                            constructor: DeclarationId(2234),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2231),
+                    constructor: DeclarationId(2237),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2217),
+                            constructor: DeclarationId(2223),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2225),
+                            constructor: DeclarationId(2231),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -47896,21 +47920,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2228),
+                            constructor: DeclarationId(2234),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2231),
+                    constructor: DeclarationId(2237),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2217),
+                            constructor: DeclarationId(2223),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2226),
+                            constructor: DeclarationId(2232),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -47921,84 +47945,84 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2228),
+                            constructor: DeclarationId(2234),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2231),
+                    constructor: DeclarationId(2237),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2218),
+                            constructor: DeclarationId(2224),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2222),
+                            constructor: DeclarationId(2228),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("255".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2228),
+                            constructor: DeclarationId(2234),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2231),
+                    constructor: DeclarationId(2237),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2218),
+                            constructor: DeclarationId(2224),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2223),
+                            constructor: DeclarationId(2229),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("65535".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2228),
+                            constructor: DeclarationId(2234),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2231),
+                    constructor: DeclarationId(2237),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2218),
+                            constructor: DeclarationId(2224),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2224),
+                            constructor: DeclarationId(2230),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("4294967295".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2228),
+                            constructor: DeclarationId(2234),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2231),
+                    constructor: DeclarationId(2237),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2218),
+                            constructor: DeclarationId(2224),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2225),
+                            constructor: DeclarationId(2231),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -48007,36 +48031,36 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2228),
+                            constructor: DeclarationId(2234),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2232),
+                    constructor: DeclarationId(2238),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("bool".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2219),
+                            constructor: DeclarationId(2225),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2221),
+                            constructor: DeclarationId(2227),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2232),
+                    constructor: DeclarationId(2238),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("()".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2220),
+                            constructor: DeclarationId(2226),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2227),
+                            constructor: DeclarationId(2233),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -55740,7 +55764,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1073, 1085),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1073, 1086),
         });
         declarations.push(Declaration {
             id: DeclarationId(1909),
@@ -55754,7 +55778,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1090, 1103),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1091, 1103),
         });
         declarations.push(Declaration {
             id: DeclarationId(1910),
@@ -55782,11 +55806,53 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1125, 1148),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1125, 1147),
         });
         declarations.push(Declaration {
             id: DeclarationId(1912),
             name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1152, 1171),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1913),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1176, 1201),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1914),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1206, 1229),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1915),
+            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -55801,10 +55867,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5348, 5384),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5429, 5465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1913),
+            id: DeclarationId(1916),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55820,10 +55886,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5389, 5430),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5470, 5511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1914),
+            id: DeclarationId(1917),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -55840,10 +55906,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5889, 5905),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5970, 5986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1915),
+            id: DeclarationId(1918),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55859,10 +55925,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9017, 9058),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9098, 9139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1916),
+            id: DeclarationId(1919),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55873,10 +55939,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9355, 9367),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9436, 9448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1917),
+            id: DeclarationId(1920),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -55893,10 +55959,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9637, 9649),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9718, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1918),
+            id: DeclarationId(1921),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55906,7 +55972,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "sites".to_string(),
-                        ty: DeclarationId(1917),
+                        ty: DeclarationId(1920),
                     },
                 ],
             },
@@ -55918,10 +55984,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9594, 9651),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9675, 9732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1919),
+            id: DeclarationId(1922),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55937,10 +56003,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9961, 9995),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10042, 10076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1920),
+            id: DeclarationId(1923),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55956,10 +56022,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10398, 10449),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10479, 10530),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1921),
+            id: DeclarationId(1924),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55970,10 +56036,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10792, 10810),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10873, 10891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1922),
+            id: DeclarationId(1925),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55999,10 +56065,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 11160, 11258),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 11241, 11339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1923),
+            id: DeclarationId(1926),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -56022,7 +56088,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4846, 4866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1924),
+            id: DeclarationId(1927),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(886),
@@ -56048,7 +56114,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4876, 4900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1925),
+            id: DeclarationId(1928),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(886),
@@ -56074,7 +56140,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4911, 4935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1926),
+            id: DeclarationId(1929),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(886),
@@ -56100,7 +56166,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4941, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1927),
+            id: DeclarationId(1930),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -56120,7 +56186,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5042, 5062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1928),
+            id: DeclarationId(1931),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(886),
@@ -56146,7 +56212,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5072, 5096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1929),
+            id: DeclarationId(1932),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(886),
@@ -56172,7 +56238,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5107, 5131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1930),
+            id: DeclarationId(1933),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(886),
@@ -56198,7 +56264,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5137, 5161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1931),
+            id: DeclarationId(1934),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -56218,7 +56284,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5245, 5265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1932),
+            id: DeclarationId(1935),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(886),
@@ -56244,7 +56310,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5276, 5300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1933),
+            id: DeclarationId(1936),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(886),
@@ -56270,7 +56336,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5325, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1934),
+            id: DeclarationId(1937),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -56290,7 +56356,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5440, 5460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1935),
+            id: DeclarationId(1938),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(886),
@@ -56316,7 +56382,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5471, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1936),
+            id: DeclarationId(1939),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(886),
@@ -56342,7 +56408,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5520, 5544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1937),
+            id: DeclarationId(1940),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56361,7 +56427,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1634, 1651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1938),
+            id: DeclarationId(1941),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56386,7 +56452,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1656, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1939),
+            id: DeclarationId(1942),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56400,7 +56466,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1879, 1891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1940),
+            id: DeclarationId(1943),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56419,7 +56485,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1896, 1932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1941),
+            id: DeclarationId(1944),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(879),
@@ -56439,13 +56505,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2414, 2430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1942),
+            id: DeclarationId(1945),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(608),
-                    value: DeclarationId(1941),
+                    value: DeclarationId(1944),
                 }],
             },
             type_params: vec![],
@@ -56459,7 +56525,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2409, 2431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1943),
+            id: DeclarationId(1946),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56473,7 +56539,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1942),
+                        ty: DeclarationId(1945),
                     },
                 ],
             },
@@ -56488,7 +56554,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2325, 2437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1944),
+            id: DeclarationId(1947),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -56508,7 +56574,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2505, 2521),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1945),
+            id: DeclarationId(1948),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(879),
@@ -56528,13 +56594,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2544, 2560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1946),
+            id: DeclarationId(1949),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(608),
-                    value: DeclarationId(1945),
+                    value: DeclarationId(1948),
                 }],
             },
             type_params: vec![],
@@ -56548,7 +56614,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2539, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1947),
+            id: DeclarationId(1950),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56558,11 +56624,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "violations".to_string(),
-                        ty: DeclarationId(1944),
+                        ty: DeclarationId(1947),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1946),
+                        ty: DeclarationId(1949),
                     },
                 ],
             },
@@ -56577,7 +56643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2442, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1948),
+            id: DeclarationId(1951),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(879),
@@ -56597,11 +56663,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3902, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1949),
+            id: DeclarationId(1952),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(748), DeclarationId(747)],
-                output: DeclarationId(1948),
+                output: DeclarationId(1951),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -56615,7 +56681,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3881, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1950),
+            id: DeclarationId(1953),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -56635,7 +56701,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3930, 3945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1951),
+            id: DeclarationId(1954),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747), DeclarationId(885)],
@@ -56653,7 +56719,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3966, 4009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1952),
+            id: DeclarationId(1955),
             name: Some("DimensionUnitAbelianGroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(25),
@@ -56673,7 +56739,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1953),
+            id: DeclarationId(1956),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -56693,7 +56759,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1954),
+            id: DeclarationId(1957),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56707,7 +56773,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4188, 4204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1955),
+            id: DeclarationId(1958),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56726,7 +56792,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4209, 4237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1956),
+            id: DeclarationId(1959),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56745,7 +56811,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4727, 4746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1957),
+            id: DeclarationId(1960),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56764,7 +56830,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4751, 4773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1958),
+            id: DeclarationId(1961),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -56784,7 +56850,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5142, 5165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1959),
+            id: DeclarationId(1962),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56798,7 +56864,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6162, 6170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1960),
+            id: DeclarationId(1963),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56812,7 +56878,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6175, 6183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1961),
+            id: DeclarationId(1964),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56826,7 +56892,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1962),
+            id: DeclarationId(1965),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56840,7 +56906,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6634, 6642),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1963),
+            id: DeclarationId(1966),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56854,7 +56920,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6978, 6991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1964),
+            id: DeclarationId(1967),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56868,7 +56934,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6996, 7002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1965),
+            id: DeclarationId(1968),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56882,7 +56948,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7260, 7268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1966),
+            id: DeclarationId(1969),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56896,7 +56962,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7273, 7278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1967),
+            id: DeclarationId(1970),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56910,7 +56976,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7283, 7296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1968),
+            id: DeclarationId(1971),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56924,7 +56990,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7633, 7651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1969),
+            id: DeclarationId(1972),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56938,7 +57004,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9026, 9035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1970),
+            id: DeclarationId(1973),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56952,7 +57018,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9040, 9053),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1971),
+            id: DeclarationId(1974),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56966,7 +57032,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9058, 9066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1972),
+            id: DeclarationId(1975),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56980,7 +57046,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9071, 9081),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1973),
+            id: DeclarationId(1976),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56994,7 +57060,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9086, 9096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1974),
+            id: DeclarationId(1977),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57008,7 +57074,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9101, 9112),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1975),
+            id: DeclarationId(1978),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57022,7 +57088,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9117, 9125),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1976),
+            id: DeclarationId(1979),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57036,7 +57102,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9130, 9137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1977),
+            id: DeclarationId(1980),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57050,7 +57116,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9142, 9152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1978),
+            id: DeclarationId(1981),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57064,7 +57130,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9157, 9169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1979),
+            id: DeclarationId(1982),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57078,7 +57144,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11862, 11888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1980),
+            id: DeclarationId(1983),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57092,7 +57158,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11893, 11903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1981),
+            id: DeclarationId(1984),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57106,7 +57172,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16115, 16121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1982),
+            id: DeclarationId(1985),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57120,7 +57186,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16126, 16137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1983),
+            id: DeclarationId(1986),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57134,7 +57200,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16457, 16468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1984),
+            id: DeclarationId(1987),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57148,7 +57214,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16473, 16484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1985),
+            id: DeclarationId(1988),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57162,7 +57228,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 18417, 18428),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1986),
+            id: DeclarationId(1989),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57176,7 +57242,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 18433, 18441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1987),
+            id: DeclarationId(1990),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57195,7 +57261,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19604, 19639),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1988),
+            id: DeclarationId(1991),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57220,7 +57286,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19644, 19732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1989),
+            id: DeclarationId(1992),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -57240,7 +57306,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 4881, 4909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1990),
+            id: DeclarationId(1993),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(847),
@@ -57257,7 +57323,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20505, 20517),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1991),
+            id: DeclarationId(1994),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(850),
@@ -57274,7 +57340,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21890, 21905),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1992),
+            id: DeclarationId(1995),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -57294,7 +57360,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27797, 27812),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1993),
+            id: DeclarationId(1996),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -57311,7 +57377,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 31950, 31954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1994),
+            id: DeclarationId(1997),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -57328,7 +57394,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 32246, 32250),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1995),
+            id: DeclarationId(1998),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -57345,7 +57411,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33495, 33499),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1996),
+            id: DeclarationId(1999),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -57362,7 +57428,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33970, 33974),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1997),
+            id: DeclarationId(2000),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -57379,7 +57445,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35233, 35237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1998),
+            id: DeclarationId(2001),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -57396,7 +57462,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35505, 35509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1999),
+            id: DeclarationId(2002),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57410,7 +57476,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5562, 5577),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2000),
+            id: DeclarationId(2003),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57424,7 +57490,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5617, 5630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2001),
+            id: DeclarationId(2004),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57438,7 +57504,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5678, 5695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2002),
+            id: DeclarationId(2005),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57452,7 +57518,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5734, 5746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2003),
+            id: DeclarationId(2006),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57466,7 +57532,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5794, 5811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2004),
+            id: DeclarationId(2007),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57491,7 +57557,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 9904, 9966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2005),
+            id: DeclarationId(2008),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57510,7 +57576,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10013),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2006),
+            id: DeclarationId(2009),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57535,7 +57601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10018, 10075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2007),
+            id: DeclarationId(2010),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57549,7 +57615,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10080, 10094),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2008),
+            id: DeclarationId(2011),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57563,7 +57629,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10099, 10114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2009),
+            id: DeclarationId(2012),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57577,7 +57643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24082, 24096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2010),
+            id: DeclarationId(2013),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57596,7 +57662,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24101, 24148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2011),
+            id: DeclarationId(2014),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57621,7 +57687,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24153, 24230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2012),
+            id: DeclarationId(2015),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57646,7 +57712,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24235, 24309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2013),
+            id: DeclarationId(2016),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57671,7 +57737,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24929, 24985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2014),
+            id: DeclarationId(2017),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57690,7 +57756,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 25001, 25026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2015),
+            id: DeclarationId(2018),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57704,7 +57770,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26675, 26688),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2016),
+            id: DeclarationId(2019),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57723,7 +57789,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26732, 26764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2017),
+            id: DeclarationId(2020),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -57743,12 +57809,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26827, 26843),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2018),
+            id: DeclarationId(2021),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "factors".to_string(),
-                    ty: DeclarationId(2017),
+                    ty: DeclarationId(2020),
                 }],
             },
             type_params: vec![],
@@ -57762,7 +57828,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26803, 26845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2019),
+            id: DeclarationId(2022),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -57782,13 +57848,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26907, 26923),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2020),
+            id: DeclarationId(2023),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(608),
-                    value: DeclarationId(2019),
+                    value: DeclarationId(2022),
                 }],
             },
             type_params: vec![],
@@ -57802,12 +57868,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26902, 26924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2021),
+            id: DeclarationId(2024),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2020),
+                    ty: DeclarationId(2023),
                 }],
             },
             type_params: vec![],
@@ -57821,7 +57887,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26874, 26926),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2022),
+            id: DeclarationId(2025),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -57841,12 +57907,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27224, 27239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2023),
+            id: DeclarationId(2026),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2022),
+                    ty: DeclarationId(2025),
                 }],
             },
             type_params: vec![],
@@ -57860,7 +57926,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27206, 27241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2024),
+            id: DeclarationId(2027),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57874,7 +57940,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27324, 27336),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2025),
+            id: DeclarationId(2028),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57888,7 +57954,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27406, 27416),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2026),
+            id: DeclarationId(2029),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -57908,7 +57974,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1234, 1254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2027),
+            id: DeclarationId(2030),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -57928,7 +57994,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1414, 1434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2028),
+            id: DeclarationId(2031),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(879),
@@ -57948,11 +58014,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2029),
+            id: DeclarationId(2032),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(748), DeclarationId(747)],
-                output: DeclarationId(2028),
+                output: DeclarationId(2031),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -57966,7 +58032,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2030),
+            id: DeclarationId(2033),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -57986,7 +58052,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2031),
+            id: DeclarationId(2034),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1011), DeclarationId(1011)],
@@ -58004,7 +58070,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2032),
+            id: DeclarationId(2035),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1011), DeclarationId(738)],
@@ -58022,7 +58088,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2033),
+            id: DeclarationId(2036),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(748), DeclarationId(1011)],
@@ -58040,7 +58106,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2034),
+            id: DeclarationId(2037),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1012),
@@ -58060,7 +58126,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4577, 4588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2035),
+            id: DeclarationId(2038),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1012),
@@ -58080,7 +58146,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4630, 4641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2036),
+            id: DeclarationId(2039),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58094,7 +58160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4532, 4536),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2037),
+            id: DeclarationId(2040),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58113,7 +58179,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4541, 4551),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2038),
+            id: DeclarationId(2041),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -58137,7 +58203,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2039),
+            id: DeclarationId(2042),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58156,7 +58222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2132, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2040),
+            id: DeclarationId(2043),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -58176,12 +58242,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2174, 2190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2041),
+            id: DeclarationId(2044),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2040),
+                    ty: DeclarationId(2043),
                 }],
             },
             type_params: vec![],
@@ -58195,7 +58261,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2162, 2191),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2042),
+            id: DeclarationId(2045),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58220,7 +58286,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2196, 2247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2043),
+            id: DeclarationId(2046),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58239,7 +58305,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2252, 2267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2044),
+            id: DeclarationId(2047),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58258,7 +58324,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2272, 2299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2045),
+            id: DeclarationId(2048),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -58284,7 +58350,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 3931, 3949),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2046),
+            id: DeclarationId(2049),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -58304,7 +58370,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 4537, 4552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2047),
+            id: DeclarationId(2050),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58323,7 +58389,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5405, 5459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2048),
+            id: DeclarationId(2051),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58337,7 +58403,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5724, 5733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2049),
+            id: DeclarationId(2052),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -58357,7 +58423,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3589, 3617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2050),
+            id: DeclarationId(2053),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -58383,7 +58449,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/services.dag", 6838, 6861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2051),
+            id: DeclarationId(2054),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1038),
@@ -58400,7 +58466,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2329, 2345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2052),
+            id: DeclarationId(2055),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1038),
@@ -58417,7 +58483,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2350, 2366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2053),
+            id: DeclarationId(2056),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1038),
@@ -58434,7 +58500,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2371, 2387),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2054),
+            id: DeclarationId(2057),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -58460,7 +58526,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2632, 2660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2055),
+            id: DeclarationId(2058),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -58486,7 +58552,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2704, 2732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2056),
+            id: DeclarationId(2059),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1046),
@@ -58503,7 +58569,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5879, 5901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2057),
+            id: DeclarationId(2060),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1047),
@@ -58520,7 +58586,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6321, 6341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2058),
+            id: DeclarationId(2061),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58534,7 +58600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 667, 673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2059),
+            id: DeclarationId(2062),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58548,7 +58614,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 678, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2060),
+            id: DeclarationId(2063),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58562,7 +58628,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 696, 710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2061),
+            id: DeclarationId(2064),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58581,7 +58647,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3232, 3258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2062),
+            id: DeclarationId(2065),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58600,7 +58666,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3263, 3291),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2063),
+            id: DeclarationId(2066),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58619,7 +58685,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3296, 3329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2064),
+            id: DeclarationId(2067),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58638,7 +58704,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3334, 3365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2065),
+            id: DeclarationId(2068),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58657,7 +58723,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3370, 3402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2066),
+            id: DeclarationId(2069),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58671,7 +58737,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4409, 4416),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2067),
+            id: DeclarationId(2070),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58690,7 +58756,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4421, 4471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2068),
+            id: DeclarationId(2071),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58704,7 +58770,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4966, 4977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2069),
+            id: DeclarationId(2072),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58723,7 +58789,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4982, 5027),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2070),
+            id: DeclarationId(2073),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58742,7 +58808,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7131, 7165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2071),
+            id: DeclarationId(2074),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58761,7 +58827,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7170, 7214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2072),
+            id: DeclarationId(2075),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58780,7 +58846,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7219, 7277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2073),
+            id: DeclarationId(2076),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58799,7 +58865,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7282, 7338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2074),
+            id: DeclarationId(2077),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58818,7 +58884,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7343, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2075),
+            id: DeclarationId(2078),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58837,7 +58903,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7381, 7411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2076),
+            id: DeclarationId(2079),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58851,7 +58917,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7416, 7429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2077),
+            id: DeclarationId(2080),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -58871,7 +58937,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7469, 7491),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2078),
+            id: DeclarationId(2081),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -58891,7 +58957,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7701, 7722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2079),
+            id: DeclarationId(2082),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58905,7 +58971,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2080),
+            id: DeclarationId(2083),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58919,7 +58985,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2081),
+            id: DeclarationId(2084),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58933,7 +58999,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2082),
+            id: DeclarationId(2085),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58947,7 +59013,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2083),
+            id: DeclarationId(2086),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58961,7 +59027,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2084),
+            id: DeclarationId(2087),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58975,7 +59041,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2085),
+            id: DeclarationId(2088),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58989,7 +59055,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 716),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2086),
+            id: DeclarationId(2089),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59003,7 +59069,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 721, 729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2087),
+            id: DeclarationId(2090),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59017,7 +59083,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 734, 742),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2088),
+            id: DeclarationId(2091),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59031,7 +59097,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 747, 754),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2089),
+            id: DeclarationId(2092),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59045,7 +59111,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 759, 765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2090),
+            id: DeclarationId(2093),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59059,7 +59125,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 770, 777),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2091),
+            id: DeclarationId(2094),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59073,7 +59139,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 782, 788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2092),
+            id: DeclarationId(2095),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59087,7 +59153,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 793, 800),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2093),
+            id: DeclarationId(2096),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59106,7 +59172,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 805, 818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2094),
+            id: DeclarationId(2097),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59125,7 +59191,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 823, 834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2095),
+            id: DeclarationId(2098),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59144,7 +59210,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 839, 856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2096),
+            id: DeclarationId(2099),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59158,7 +59224,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 861, 863),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2097),
+            id: DeclarationId(2100),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59172,7 +59238,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 868, 872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2098),
+            id: DeclarationId(2101),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59186,7 +59252,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 877, 882),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2099),
+            id: DeclarationId(2102),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59200,7 +59266,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 887, 889),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2100),
+            id: DeclarationId(2103),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59214,7 +59280,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 894, 896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2101),
+            id: DeclarationId(2104),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59228,7 +59294,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 901, 903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2102),
+            id: DeclarationId(2105),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59242,7 +59308,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 910),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2103),
+            id: DeclarationId(2106),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59256,7 +59322,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 915, 919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2104),
+            id: DeclarationId(2107),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59270,7 +59336,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 924, 929),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2105),
+            id: DeclarationId(2108),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59284,7 +59350,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 934, 938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2106),
+            id: DeclarationId(2109),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59298,7 +59364,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 943, 948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2107),
+            id: DeclarationId(2110),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59312,7 +59378,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 953, 959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2108),
+            id: DeclarationId(2111),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59326,7 +59392,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 964, 972),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2109),
+            id: DeclarationId(2112),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59340,7 +59406,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2110),
+            id: DeclarationId(2113),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59354,7 +59420,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 987, 992),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2111),
+            id: DeclarationId(2114),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59368,7 +59434,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 997, 1005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2112),
+            id: DeclarationId(2115),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59382,7 +59448,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1010, 1019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2113),
+            id: DeclarationId(2116),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59396,7 +59462,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1024, 1027),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2114),
+            id: DeclarationId(2117),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59410,7 +59476,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1032, 1038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2115),
+            id: DeclarationId(2118),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59424,7 +59490,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1043, 1049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2116),
+            id: DeclarationId(2119),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59438,7 +59504,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1054, 1060),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2117),
+            id: DeclarationId(2120),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59452,7 +59518,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1065, 1071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2118),
+            id: DeclarationId(2121),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59466,7 +59532,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1076, 1084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2119),
+            id: DeclarationId(2122),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59480,7 +59546,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1089, 1097),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2120),
+            id: DeclarationId(2123),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59494,7 +59560,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1102, 1107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2121),
+            id: DeclarationId(2124),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59508,7 +59574,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2122),
+            id: DeclarationId(2125),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59522,7 +59588,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1126, 1130),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2123),
+            id: DeclarationId(2126),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59536,7 +59602,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1135, 1143),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2124),
+            id: DeclarationId(2127),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59550,7 +59616,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1148, 1151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2125),
+            id: DeclarationId(2128),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59564,7 +59630,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1722, 1727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2126),
+            id: DeclarationId(2129),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59578,7 +59644,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1732, 1736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2127),
+            id: DeclarationId(2130),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59592,7 +59658,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1741, 1747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2128),
+            id: DeclarationId(2131),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59606,7 +59672,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1752, 1758),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2129),
+            id: DeclarationId(2132),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59620,7 +59686,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1763, 1767),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2130),
+            id: DeclarationId(2133),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59634,7 +59700,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1772, 1778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2131),
+            id: DeclarationId(2134),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59648,7 +59714,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1783, 1792),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2132),
+            id: DeclarationId(2135),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59662,7 +59728,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1797, 1805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2133),
+            id: DeclarationId(2136),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59676,7 +59742,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2134),
+            id: DeclarationId(2137),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59690,7 +59756,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1823, 1830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2135),
+            id: DeclarationId(2138),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59704,7 +59770,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1835, 1841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2136),
+            id: DeclarationId(2139),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59718,7 +59784,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1846, 1853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2137),
+            id: DeclarationId(2140),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59732,7 +59798,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1858, 1864),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2138),
+            id: DeclarationId(2141),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59746,7 +59812,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1869, 1876),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2139),
+            id: DeclarationId(2142),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59760,7 +59826,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2316, 2318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2140),
+            id: DeclarationId(2143),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59774,7 +59840,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2323, 2327),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2141),
+            id: DeclarationId(2144),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59788,7 +59854,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2332, 2337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2142),
+            id: DeclarationId(2145),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59802,7 +59868,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2342, 2344),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2143),
+            id: DeclarationId(2146),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59816,7 +59882,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2349, 2351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2144),
+            id: DeclarationId(2147),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59830,7 +59896,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2356, 2358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2145),
+            id: DeclarationId(2148),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59844,7 +59910,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2363, 2365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2146),
+            id: DeclarationId(2149),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59858,7 +59924,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2370, 2374),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2147),
+            id: DeclarationId(2150),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59872,7 +59938,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2379, 2384),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2148),
+            id: DeclarationId(2151),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59886,7 +59952,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2389, 2393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2149),
+            id: DeclarationId(2152),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59900,7 +59966,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2398, 2403),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2150),
+            id: DeclarationId(2153),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59914,7 +59980,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2408, 2414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2151),
+            id: DeclarationId(2154),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59928,7 +59994,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2419, 2427),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2152),
+            id: DeclarationId(2155),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59942,7 +60008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2432, 2437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2153),
+            id: DeclarationId(2156),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59956,7 +60022,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2442, 2447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2154),
+            id: DeclarationId(2157),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59970,7 +60036,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2452, 2460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2155),
+            id: DeclarationId(2158),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59984,7 +60050,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2465, 2474),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2156),
+            id: DeclarationId(2159),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59998,7 +60064,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2479, 2482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2157),
+            id: DeclarationId(2160),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60012,7 +60078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2493),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2158),
+            id: DeclarationId(2161),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60026,7 +60092,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2498, 2504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2159),
+            id: DeclarationId(2162),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60040,7 +60106,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2509, 2515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2160),
+            id: DeclarationId(2163),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60054,7 +60120,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2161),
+            id: DeclarationId(2164),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60068,7 +60134,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2531, 2539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2162),
+            id: DeclarationId(2165),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60082,7 +60148,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2544, 2552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2163),
+            id: DeclarationId(2166),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60096,7 +60162,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2557, 2562),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2164),
+            id: DeclarationId(2167),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60110,7 +60176,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2567, 2576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2165),
+            id: DeclarationId(2168),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60124,7 +60190,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2581, 2585),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2166),
+            id: DeclarationId(2169),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60138,7 +60204,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2590, 2598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2167),
+            id: DeclarationId(2170),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60155,10 +60221,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 14633, 14656),
+            span: SourceSpan::new("src/v3/std/verification.dag", 14714, 14737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2168),
+            id: DeclarationId(2171),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60175,10 +60241,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 14858, 14873),
+            span: SourceSpan::new("src/v3/std/verification.dag", 14939, 14954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2169),
+            id: DeclarationId(2172),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60195,10 +60261,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 14878, 14898),
+            span: SourceSpan::new("src/v3/std/verification.dag", 14959, 14979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2170),
+            id: DeclarationId(2173),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60212,7 +60278,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2480, 2494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2171),
+            id: DeclarationId(2174),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60226,7 +60292,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2499, 2509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2172),
+            id: DeclarationId(2175),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60240,7 +60306,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2514, 2526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2173),
+            id: DeclarationId(2176),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60251,10 +60317,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2531, 2543),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2531, 2544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2174),
+            id: DeclarationId(2177),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60265,10 +60331,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2548, 2561),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2549, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2175),
+            id: DeclarationId(2178),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60282,7 +60348,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2566, 2578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2176),
+            id: DeclarationId(2179),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60293,10 +60359,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2583, 2606),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2583, 2605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2177),
+            id: DeclarationId(2180),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60307,10 +60373,52 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3012, 3021),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2610, 2629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2178),
+            id: DeclarationId(2181),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/verification.dag", 2634, 2659),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2182),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/verification.dag", 2664, 2687),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2183),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/verification.dag", 3093, 3102),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2184),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60326,10 +60434,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3026, 3042),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3107, 3123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2179),
+            id: DeclarationId(2185),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60340,10 +60448,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3701, 3709),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3782, 3790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2180),
+            id: DeclarationId(2186),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60354,10 +60462,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3714, 3724),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3795, 3805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2181),
+            id: DeclarationId(2187),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60368,10 +60476,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4539, 4552),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4620, 4633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2182),
+            id: DeclarationId(2188),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60382,10 +60490,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4557, 4570),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4638, 4651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2183),
+            id: DeclarationId(2189),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60396,10 +60504,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4575, 4583),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4656, 4664),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2184),
+            id: DeclarationId(2190),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60410,10 +60518,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4608, 4616),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4689, 4697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2185),
+            id: DeclarationId(2191),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60429,10 +60537,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4621, 4661),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4702, 4742),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2186),
+            id: DeclarationId(2192),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60448,10 +60556,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4666, 4699),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4747, 4780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2187),
+            id: DeclarationId(2193),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60473,10 +60581,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4704, 4782),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4785, 4863),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2188),
+            id: DeclarationId(2194),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60492,10 +60600,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4948, 5011),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5029, 5092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2189),
+            id: DeclarationId(2195),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60521,10 +60629,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5016, 5107),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5097, 5188),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2190),
+            id: DeclarationId(2196),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60550,10 +60658,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5112, 5244),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5193, 5325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2191),
+            id: DeclarationId(2197),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60575,10 +60683,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5459, 5548),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5540, 5629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2192),
+            id: DeclarationId(2198),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60595,10 +60703,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6348, 6360),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6429, 6441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2193),
+            id: DeclarationId(2199),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60608,7 +60716,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2192),
+                        ty: DeclarationId(2198),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -60624,10 +60732,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6297, 6394),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6378, 6475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2194),
+            id: DeclarationId(2200),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60644,10 +60752,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 7094, 7106),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7175, 7187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2195),
+            id: DeclarationId(2201),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60657,7 +60765,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2194),
+                        ty: DeclarationId(2200),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -60673,10 +60781,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 7044, 7140),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7125, 7221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2196),
+            id: DeclarationId(2202),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60702,10 +60810,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 7438, 7560),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7519, 7641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2197),
+            id: DeclarationId(2203),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60731,10 +60839,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 7822, 7947),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7903, 8028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2198),
+            id: DeclarationId(2204),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60756,10 +60864,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 8514, 8626),
+            span: SourceSpan::new("src/v3/std/verification.dag", 8595, 8707),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2199),
+            id: DeclarationId(2205),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60781,10 +60889,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9222, 9301),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9303, 9382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2200),
+            id: DeclarationId(2206),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60810,10 +60918,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9521, 9634),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9602, 9715),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2201),
+            id: DeclarationId(2207),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60839,10 +60947,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9639, 9775),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9720, 9856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2202),
+            id: DeclarationId(2208),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60864,10 +60972,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9780, 9862),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9861, 9943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2203),
+            id: DeclarationId(2209),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60889,10 +60997,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9867, 9953),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9948, 10034),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2204),
+            id: DeclarationId(2210),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60909,10 +61017,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10032, 10042),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10113, 10123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2205),
+            id: DeclarationId(2211),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60922,7 +61030,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "generated_paths".to_string(),
-                        ty: DeclarationId(2204),
+                        ty: DeclarationId(2210),
                     },
                 ],
             },
@@ -60934,10 +61042,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9958, 10048),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10039, 10129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2206),
+            id: DeclarationId(2212),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60963,10 +61071,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10990, 11124),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11071, 11205),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2207),
+            id: DeclarationId(2213),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60992,10 +61100,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11763, 11907),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11844, 11988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2208),
+            id: DeclarationId(2214),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61011,10 +61119,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12752, 12806),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12833, 12887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2209),
+            id: DeclarationId(2215),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61031,10 +61139,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 13850, 13873),
+            span: SourceSpan::new("src/v3/std/verification.dag", 13931, 13954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2210),
+            id: DeclarationId(2216),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61051,10 +61159,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 13919, 13934),
+            span: SourceSpan::new("src/v3/std/verification.dag", 14000, 14015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2211),
+            id: DeclarationId(2217),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61071,10 +61179,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 14190, 14213),
+            span: SourceSpan::new("src/v3/std/verification.dag", 14271, 14294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2212),
+            id: DeclarationId(2218),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61094,7 +61202,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2213),
+            id: DeclarationId(2219),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61108,7 +61216,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 532, 547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2214),
+            id: DeclarationId(2220),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61122,7 +61230,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 550, 561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2215),
+            id: DeclarationId(2221),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61136,7 +61244,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2216),
+            id: DeclarationId(2222),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(726),
@@ -61153,7 +61261,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2217),
+            id: DeclarationId(2223),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61167,7 +61275,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5552, 5570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2218),
+            id: DeclarationId(2224),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61181,7 +61289,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5575, 5590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2219),
+            id: DeclarationId(2225),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61195,7 +61303,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5619, 5640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2220),
+            id: DeclarationId(2226),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61209,7 +61317,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5645, 5660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2221),
+            id: DeclarationId(2227),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61223,7 +61331,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7257, 7267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2222),
+            id: DeclarationId(2228),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61237,7 +61345,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7272, 7283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2223),
+            id: DeclarationId(2229),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61251,7 +61359,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7288, 7301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2224),
+            id: DeclarationId(2230),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61265,7 +61373,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7306, 7319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2225),
+            id: DeclarationId(2231),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61279,7 +61387,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7324, 7337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2226),
+            id: DeclarationId(2232),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61293,7 +61401,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7342, 7356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2227),
+            id: DeclarationId(2233),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61307,7 +61415,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7361, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2228),
+            id: DeclarationId(2234),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61321,7 +61429,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8118, 8135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2229),
+            id: DeclarationId(2235),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61335,7 +61443,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8140, 8150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2230),
+            id: DeclarationId(2236),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61349,7 +61457,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8155, 8159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2231),
+            id: DeclarationId(2237),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61394,7 +61502,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8937, 9509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2232),
+            id: DeclarationId(2238),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61427,7 +61535,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9514, 9696),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2233),
+            id: DeclarationId(2239),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -64489,7 +64597,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(379),
             Port {
                 id: PortId(379),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2212))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2218))),
                 produced_by: Some(NodeId(279)),
             },
         );

From cf94fad33433a1cf256626041dd59222ce8c5ff1 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gunb.ai>
Date: Mon, 4 May 2026 14:00:37 -0400
Subject: [PATCH 12/18] WIP: keen-swift-519

---
 src/v3/compiler/src/diagnostics.rs | 117 ++++++++++++++++++++++++++++-
 src/v3/compiler/src/test_runner.rs |  17 +----
 2 files changed, 114 insertions(+), 20 deletions(-)

diff --git a/src/v3/compiler/src/diagnostics.rs b/src/v3/compiler/src/diagnostics.rs
index c24b8d8929b..6af15ccd499 100644
--- a/src/v3/compiler/src/diagnostics.rs
+++ b/src/v3/compiler/src/diagnostics.rs
@@ -222,10 +222,11 @@ pub enum Diagnostic {
 
 /// Layer-1 compiler diagnostic kind labels in **declaration order** of [`Diagnostic`].
 ///
-/// `src/v3/std/diagnostics.dag` `CompilerDiagnosticKind` and `src/v3/std/verification.dag`
-/// `DiagnosticKind` must carry exactly this set (integration tests ratchet the bootstrap
-/// lowering against this slice). When adding a [`Diagnostic`] variant, extend this list in
-/// lock-step and update the `.dag` closed sums — lens-instance kinds stay on the Layer-2 path
+/// The strings are the same as [`Diagnostic::layer1_kind_label`]; crate tests assert this slice
+/// stays aligned with that exhaustive mapping. Integration tests ratchet `CompilerDiagnosticKind`
+/// / `std.verification.DiagnosticKind` in the bootstrap DAG against this slice. When adding a
+/// [`Diagnostic`] variant, `layer1_kind_label` must gain an arm (compile-time exhaustiveness), then
+/// extend this list and the `.dag` closed sums — lens-instance kinds stay on the Layer-2 path
 /// (Q6.5), not here.
 pub const LAYER1_DIAGNOSTIC_KIND_LABELS: &[&str] = &[
     "TokenizerError",
@@ -241,6 +242,27 @@ pub const LAYER1_DIAGNOSTIC_KIND_LABELS: &[&str] = &[
 ];
 
 impl Diagnostic {
+    /// Stable Layer-1 kind name for substrate mirrors and test predicates (Q6.5).
+    ///
+    /// This match is **exhaustive with no wildcard**: adding a [`Diagnostic`] variant is a
+    /// compile error until a new arm is authored here. [`LAYER1_DIAGNOSTIC_KIND_LABELS`] must stay
+    /// in the same **declaration order** as this enum; crate tests ratchet the slice against
+    /// representative diagnostics via this method.
+    pub fn layer1_kind_label(&self) -> &'static str {
+        match self {
+            Diagnostic::TokenizerError { .. } => "TokenizerError",
+            Diagnostic::ParseError { .. } => "ParseError",
+            Diagnostic::TypeMismatch { .. } => "TypeMismatch",
+            Diagnostic::ArityMismatch { .. } => "ArityMismatch",
+            Diagnostic::ResolveError { .. } => "ResolveError",
+            Diagnostic::UnitMismatch { .. } => "UnitMismatch",
+            Diagnostic::BranchConditionNotBool { .. } => "BranchConditionNotBool",
+            Diagnostic::MagnitudeOutOfRange { .. } => "MagnitudeOutOfRange",
+            Diagnostic::MalformedIntegerRangeFact { .. } => "MalformedIntegerRangeFact",
+            Diagnostic::NominalOpacityViolation { .. } => "NominalOpacityViolation",
+        }
+    }
+
     pub fn span(&self) -> &SourceSpan {
         match self {
             Diagnostic::TokenizerError { span, .. }
@@ -836,6 +858,93 @@ impl DiagnosticTable {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::types::TypeShape;
+
+    fn layer1_diagnostic_examples_in_declaration_order() -> Vec<Diagnostic> {
+        let span = SourceSpan::new("layer1_kind_label_ratchets.v3", 0, 0);
+        let fixes = Vec::new();
+        let ty = TypeShape::new(DeclarationId(0));
+        vec![
+            Diagnostic::TokenizerError {
+                message: String::new(),
+                span: span.clone(),
+                fixes: fixes.clone(),
+            },
+            Diagnostic::ParseError {
+                message: String::new(),
+                span: span.clone(),
+                fixes: fixes.clone(),
+            },
+            Diagnostic::TypeMismatch {
+                expected: ty,
+                actual: ty,
+                span: span.clone(),
+                fixes: fixes.clone(),
+            },
+            Diagnostic::ArityMismatch {
+                function: String::new(),
+                expected: 0,
+                actual: 0,
+                span: span.clone(),
+                fixes: fixes.clone(),
+            },
+            Diagnostic::ResolveError {
+                name: String::new(),
+                span: span.clone(),
+                fixes: fixes.clone(),
+            },
+            Diagnostic::UnitMismatch {
+                operator: String::new(),
+                parameter: String::new(),
+                expected: ty,
+                actual: ty,
+                span: span.clone(),
+                fixes: fixes.clone(),
+            },
+            Diagnostic::BranchConditionNotBool {
+                port: PortId(0),
+                actual_type: None,
+                span: span.clone(),
+                fixes: fixes.clone(),
+            },
+            Diagnostic::MagnitudeOutOfRange {
+                literal: String::new(),
+                target: String::new(),
+                range_min_inclusive: String::new(),
+                range_max_inclusive: String::new(),
+                expected: ty,
+                span: span.clone(),
+                fixes: fixes.clone(),
+            },
+            Diagnostic::MalformedIntegerRangeFact {
+                message: String::new(),
+                span: span.clone(),
+                fixes: fixes.clone(),
+            },
+            Diagnostic::NominalOpacityViolation {
+                declaration: DeclarationId(0),
+                accessor: None,
+                span,
+                fixes,
+            },
+        ]
+    }
+
+    #[test]
+    fn layer1_ordered_labels_match_layer1_kind_label() {
+        let examples = layer1_diagnostic_examples_in_declaration_order();
+        assert_eq!(
+            examples.len(),
+            LAYER1_DIAGNOSTIC_KIND_LABELS.len(),
+            "declaration-order fixture must list every Diagnostic variant exactly once"
+        );
+        let mut seen = std::collections::HashSet::new();
+        for (diag, expected) in examples.iter().zip(LAYER1_DIAGNOSTIC_KIND_LABELS.iter()) {
+            let label = diag.layer1_kind_label();
+            assert_eq!(label, *expected);
+            assert!(seen.insert(label), "duplicate layer1 label: {label}");
+        }
+    }
 
     #[test]
     fn apply_correction_replaces_the_requested_span() {
diff --git a/src/v3/compiler/src/test_runner.rs b/src/v3/compiler/src/test_runner.rs
index 772ce171346..0ba70475859 100644
--- a/src/v3/compiler/src/test_runner.rs
+++ b/src/v3/compiler/src/test_runner.rs
@@ -3821,26 +3821,11 @@ fn find_bind<'a>(
     })
 }
 
-fn diagnostic_kind(diagnostic: &Diagnostic) -> &'static str {
-    match diagnostic {
-        Diagnostic::TokenizerError { .. } => "TokenizerError",
-        Diagnostic::ParseError { .. } => "ParseError",
-        Diagnostic::TypeMismatch { .. } => "TypeMismatch",
-        Diagnostic::UnitMismatch { .. } => "UnitMismatch",
-        Diagnostic::ArityMismatch { .. } => "ArityMismatch",
-        Diagnostic::ResolveError { .. } => "ResolveError",
-        Diagnostic::BranchConditionNotBool { .. } => "BranchConditionNotBool",
-        Diagnostic::MagnitudeOutOfRange { .. } => "MagnitudeOutOfRange",
-        Diagnostic::MalformedIntegerRangeFact { .. } => "MalformedIntegerRangeFact",
-        Diagnostic::NominalOpacityViolation { .. } => "NominalOpacityViolation",
-    }
-}
-
 fn diagnostic_matches_reference(
     diagnostic: &Diagnostic,
     reference: &(String, DiagnosticDetailFilter),
 ) -> bool {
-    diagnostic_kind(diagnostic) == reference.0
+    diagnostic.layer1_kind_label() == reference.0
         && match &reference.1 {
             DiagnosticDetailFilter::Any => true,
             DiagnosticDetailFilter::Contains(text) => diagnostic.message().contains(text),

From 0f27c284758ed2546ca42d26a0e912d1214d713e Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gunb.ai>
Date: Mon, 4 May 2026 14:13:06 -0400
Subject: [PATCH 13/18] WIP: keen-swift-519

---
 .../tests/integration/m1_5_testgen_test.rs      | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/v3/compiler/tests/integration/m1_5_testgen_test.rs b/src/v3/compiler/tests/integration/m1_5_testgen_test.rs
index 9410b076416..dff1e95ff20 100644
--- a/src/v3/compiler/tests/integration/m1_5_testgen_test.rs
+++ b/src/v3/compiler/tests/integration/m1_5_testgen_test.rs
@@ -460,7 +460,7 @@ fn diagnostic_detail_filter(dag: &Dag, value: &FieldValue) -> Option<String> {
 }
 
 fn match_detail(kind_label: &str, detail_contains: &Option<String>, diag: &Diagnostic) -> bool {
-    if diagnostic_kind(diag) != kind_label {
+    if diag.layer1_kind_label() != kind_label {
         return false;
     }
     match detail_contains {
@@ -469,21 +469,6 @@ fn match_detail(kind_label: &str, detail_contains: &Option<String>, diag: &Diagn
     }
 }
 
-fn diagnostic_kind(diag: &Diagnostic) -> &'static str {
-    match diag {
-        Diagnostic::TokenizerError { .. } => "TokenizerError",
-        Diagnostic::ParseError { .. } => "ParseError",
-        Diagnostic::TypeMismatch { .. } => "TypeMismatch",
-        Diagnostic::UnitMismatch { .. } => "UnitMismatch",
-        Diagnostic::ArityMismatch { .. } => "ArityMismatch",
-        Diagnostic::ResolveError { .. } => "ResolveError",
-        Diagnostic::BranchConditionNotBool { .. } => "BranchConditionNotBool",
-        Diagnostic::MagnitudeOutOfRange { .. } => "MagnitudeOutOfRange",
-        Diagnostic::MalformedIntegerRangeFact { .. } => "MalformedIntegerRangeFact",
-        Diagnostic::NominalOpacityViolation { .. } => "NominalOpacityViolation",
-    }
-}
-
 fn diagnostic_detail(diag: &Diagnostic) -> String {
     match diag {
         Diagnostic::TokenizerError { message, .. } | Diagnostic::ParseError { message, .. } => {

From b400015ce3a3b30db966b030a9f9797c54dad3ed Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gunb.ai>
Date: Mon, 4 May 2026 14:58:20 -0400
Subject: [PATCH 14/18] WIP: keen-swift-519

---
 .../integration/lens_substrate_carrier_test.rs    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/v3/compiler/tests/integration/lens_substrate_carrier_test.rs b/src/v3/compiler/tests/integration/lens_substrate_carrier_test.rs
index 8e6588430b4..ad5078a6e10 100644
--- a/src/v3/compiler/tests/integration/lens_substrate_carrier_test.rs
+++ b/src/v3/compiler/tests/integration/lens_substrate_carrier_test.rs
@@ -126,15 +126,14 @@ fn diagnostic_kind_widened_to_any_diagnostic_kind() {
 #[test]
 fn compiler_diagnostic_kind_matches_rust_layer1_authority() {
     let dag = generated_full_bootstrap_dag();
-    let substrate: HashSet<String> = disj_variant_labels(&dag, "CompilerDiagnosticKind")
-        .into_iter()
-        .collect();
-    let rust: HashSet<&str> = LAYER1_DIAGNOSTIC_KIND_LABELS.iter().copied().collect();
-    let actual: HashSet<&str> = substrate.iter().map(String::as_str).collect();
+    let substrate = disj_variant_labels(&dag, "CompilerDiagnosticKind");
+    let expected: Vec<&str> = LAYER1_DIAGNOSTIC_KIND_LABELS.to_vec();
+    let actual: Vec<&str> = substrate.iter().map(String::as_str).collect();
     assert_eq!(
-        actual, rust,
-        "CompilerDiagnosticKind must match `LAYER1_DIAGNOSTIC_KIND_LABELS` / `Diagnostic` in \
-         diagnostics.rs; lens-instance kinds use Layer-2 LensInstanceKindWitness (Q6.5 anti-bridge)"
+        actual, expected,
+        "CompilerDiagnosticKind must match `LAYER1_DIAGNOSTIC_KIND_LABELS` in **declaration order** \
+         (same order as `Diagnostic` in diagnostics.rs); a HashSet-only check would miss order \
+         drift; lens-instance kinds use Layer-2 LensInstanceKindWitness (Q6.5 anti-bridge)"
     );
 }
 

From fedc3aaae35e5b8848eff4834ef2b83a255e7d46 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gunb.ai>
Date: Mon, 4 May 2026 15:25:07 -0400
Subject: [PATCH 15/18] WIP: keen-swift-519

---
 src/v3/compiler/src/dag.rs         | 14 ++++++++++++++
 src/v3/compiler/src/diagnostics.rs |  6 +++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/v3/compiler/src/dag.rs b/src/v3/compiler/src/dag.rs
index 276aa5d9a25..3f9ac890e5c 100644
--- a/src/v3/compiler/src/dag.rs
+++ b/src/v3/compiler/src/dag.rs
@@ -146,6 +146,13 @@ impl PortId {
     }
 }
 
+#[cfg(test)]
+impl PortId {
+    pub(crate) const fn test_raw(raw: u32) -> Self {
+        Self(raw)
+    }
+}
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct DeclarationId(u32);
 
@@ -159,6 +166,13 @@ impl DeclarationId {
     }
 }
 
+#[cfg(test)]
+impl DeclarationId {
+    pub(crate) const fn test_raw(raw: u32) -> Self {
+        Self(raw)
+    }
+}
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct ClusterId(u32);
 
diff --git a/src/v3/compiler/src/diagnostics.rs b/src/v3/compiler/src/diagnostics.rs
index 6af15ccd499..bc3fe589b3b 100644
--- a/src/v3/compiler/src/diagnostics.rs
+++ b/src/v3/compiler/src/diagnostics.rs
@@ -863,7 +863,7 @@ mod tests {
     fn layer1_diagnostic_examples_in_declaration_order() -> Vec<Diagnostic> {
         let span = SourceSpan::new("layer1_kind_label_ratchets.v3", 0, 0);
         let fixes = Vec::new();
-        let ty = TypeShape::new(DeclarationId(0));
+        let ty = TypeShape::new(DeclarationId::test_raw(0));
         vec![
             Diagnostic::TokenizerError {
                 message: String::new(),
@@ -902,7 +902,7 @@ mod tests {
                 fixes: fixes.clone(),
             },
             Diagnostic::BranchConditionNotBool {
-                port: PortId(0),
+                port: PortId::test_raw(0),
                 actual_type: None,
                 span: span.clone(),
                 fixes: fixes.clone(),
@@ -922,7 +922,7 @@ mod tests {
                 fixes: fixes.clone(),
             },
             Diagnostic::NominalOpacityViolation {
-                declaration: DeclarationId(0),
+                declaration: DeclarationId::test_raw(0),
                 accessor: None,
                 span,
                 fixes,

From 0d66ecc29348efab1e12c77e7205c0734e5f03a2 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gunb.ai>
Date: Mon, 4 May 2026 19:21:18 -0400
Subject: [PATCH 16/18] WIP: keen-swift-519

---
 src/v3/compiler/src/bootstrap_generated.rs    | 2730 +++++++++--------
 ...otstrap_generated_without_parse_surface.rs | 2326 +++++++-------
 2 files changed, 2636 insertions(+), 2420 deletions(-)

diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs
index 2f78d51622c..9f0b8e14728 100644
--- a/src/v3/compiler/src/bootstrap_generated.rs
+++ b/src/v3/compiler/src/bootstrap_generated.rs
@@ -8,7 +8,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag {
         ports: bootstrapped_fixture_dag_ports(),
         diagnostics: bootstrapped_fixture_dag_diagnostics(),
         next_node_id: 315,
-        next_declaration_id: 2336,
+        next_declaration_id: 2342,
         next_port_id: 420,
         primitives: PrimitiveCache::default(),
         substrate_markers: SubstrateMarkers::default(),
@@ -24,7 +24,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag {
         emit_model_variants: EmitModelVariants::default(),
         clusters: bootstrapped_fixture_dag_clusters(),
         optional_match_disjs: bootstrapped_fixture_dag_optional_match_disjs(),
-        declaration_append_begin_after_bootstrap: 2336,
+        declaration_append_begin_after_bootstrap: 2342,
     }
 }
 
@@ -4127,7 +4127,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
 #[allow(clippy::vec_init_then_push)]
 fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
     {
-        let mut declarations = Vec::with_capacity(2336);
+        let mut declarations = Vec::with_capacity(2342);
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -23405,21 +23405,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         ty: DeclarationId(1942),
                     },
                     Field {
-                        label: "UnitMismatch".to_string(),
+                        label: "ArityMismatch".to_string(),
                         ty: DeclarationId(1943),
                     },
                     Field {
-                        label: "ArityMismatch".to_string(),
+                        label: "ResolveError".to_string(),
                         ty: DeclarationId(1944),
                     },
                     Field {
-                        label: "ResolveError".to_string(),
+                        label: "UnitMismatch".to_string(),
                         ty: DeclarationId(1945),
                     },
                     Field {
-                        label: "NominalOpacityViolation".to_string(),
+                        label: "BranchConditionNotBool".to_string(),
                         ty: DeclarationId(1946),
                     },
+                    Field {
+                        label: "MagnitudeOutOfRange".to_string(),
+                        ty: DeclarationId(1947),
+                    },
+                    Field {
+                        label: "MalformedIntegerRangeFact".to_string(),
+                        ty: DeclarationId(1948),
+                    },
+                    Field {
+                        label: "NominalOpacityViolation".to_string(),
+                        ty: DeclarationId(1949),
+                    },
                 ],
             },
             type_params: vec![],
@@ -23430,7 +23442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 990, 1148),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 990, 1229),
         });
         declarations.push(Declaration {
             id: DeclarationId(874),
@@ -23459,7 +23471,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1354, 1607),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1435, 1688),
         });
         declarations.push(Declaration {
             id: DeclarationId(875),
@@ -23484,7 +23496,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 2387, 2450),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 2468, 2531),
         });
         declarations.push(Declaration {
             id: DeclarationId(876),
@@ -23503,7 +23515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 4652, 4712),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 4733, 4793),
         });
         declarations.push(Declaration {
             id: DeclarationId(877),
@@ -23512,11 +23524,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CompilerKind".to_string(),
-                        ty: DeclarationId(1947),
+                        ty: DeclarationId(1950),
                     },
                     Field {
                         label: "LensInstanceKind".to_string(),
-                        ty: DeclarationId(1948),
+                        ty: DeclarationId(1951),
                     },
                 ],
             },
@@ -23528,7 +23540,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5321, 5430),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5402, 5511),
         });
         declarations.push(Declaration {
             id: DeclarationId(878),
@@ -23549,7 +23561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fixes".to_string(),
-                        ty: DeclarationId(1949),
+                        ty: DeclarationId(1952),
                     },
                 ],
             },
@@ -23561,7 +23573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5799, 5907),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5880, 5988),
         });
         declarations.push(Declaration {
             id: DeclarationId(879),
@@ -23570,31 +23582,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UnderRefined".to_string(),
-                        ty: DeclarationId(1950),
+                        ty: DeclarationId(1953),
                     },
                     Field {
                         label: "NoInhabitant".to_string(),
-                        ty: DeclarationId(1951),
+                        ty: DeclarationId(1954),
                     },
                     Field {
                         label: "ContradictoryUse".to_string(),
-                        ty: DeclarationId(1953),
+                        ty: DeclarationId(1956),
                     },
                     Field {
                         label: "OutOfR2Scope".to_string(),
-                        ty: DeclarationId(1954),
+                        ty: DeclarationId(1957),
                     },
                     Field {
                         label: "LifetimeProgramExtractionPending".to_string(),
-                        ty: DeclarationId(1955),
+                        ty: DeclarationId(1958),
                     },
                     Field {
                         label: "FoldNotImplemented".to_string(),
-                        ty: DeclarationId(1956),
+                        ty: DeclarationId(1959),
                     },
                     Field {
                         label: "MissingEmissionPath".to_string(),
-                        ty: DeclarationId(1957),
+                        ty: DeclarationId(1960),
                     },
                 ],
             },
@@ -23606,7 +23618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 8541, 11258),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 8622, 11339),
         });
         declarations.push(Declaration {
             id: DeclarationId(880),
@@ -23615,11 +23627,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Inhabits".to_string(),
-                        ty: DeclarationId(1972),
+                        ty: DeclarationId(1975),
                     },
                     Field {
                         label: "Violates".to_string(),
-                        ty: DeclarationId(1973),
+                        ty: DeclarationId(1976),
                     },
                 ],
             },
@@ -23654,11 +23666,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoDiagnostic".to_string(),
-                        ty: DeclarationId(1974),
+                        ty: DeclarationId(1977),
                     },
                     Field {
                         label: "SomeDiagnostic".to_string(),
-                        ty: DeclarationId(1975),
+                        ty: DeclarationId(1978),
                     },
                 ],
             },
@@ -23679,11 +23691,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DimensionOk".to_string(),
-                        ty: DeclarationId(1978),
+                        ty: DeclarationId(1981),
                     },
                     Field {
                         label: "DimensionFail".to_string(),
-                        ty: DeclarationId(1982),
+                        ty: DeclarationId(1985),
                     },
                 ],
             },
@@ -23722,15 +23734,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "witness_of".to_string(),
-                        ty: DeclarationId(1984),
+                        ty: DeclarationId(1987),
                     },
                     Field {
                         label: "compose".to_string(),
-                        ty: DeclarationId(1985),
+                        ty: DeclarationId(1988),
                     },
                     Field {
                         label: "break_diagnostic".to_string(),
-                        ty: DeclarationId(1986),
+                        ty: DeclarationId(1989),
                     },
                 ],
             },
@@ -23770,7 +23782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             type_params: vec![DeclarationId(888), DeclarationId(889)],
             phantom_params: vec![PhantomParameter {
                 parameter: DeclarationId(888),
-                algebra: DeclarationId(1987),
+                algebra: DeclarationId(1990),
             }],
             meta_tag: None,
             specialization_parent: None,
@@ -23911,11 +23923,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("add_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1958),
-                    DeclarationId(1959),
-                    DeclarationId(1960),
+                    DeclarationId(1961),
+                    DeclarationId(1962),
+                    DeclarationId(1963),
                 ],
-                output: DeclarationId(1961),
+                output: DeclarationId(1964),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)),
             },
             type_params: vec![DeclarationId(898), DeclarationId(899)],
@@ -23961,11 +23973,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("sub_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1962),
-                    DeclarationId(1963),
-                    DeclarationId(1964),
+                    DeclarationId(1965),
+                    DeclarationId(1966),
+                    DeclarationId(1967),
                 ],
-                output: DeclarationId(1965),
+                output: DeclarationId(1968),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)),
             },
             type_params: vec![DeclarationId(901), DeclarationId(902)],
@@ -24010,8 +24022,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(903),
             name: Some("mul_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1966), DeclarationId(1967), DeclarationId(905)],
-                output: DeclarationId(1968),
+                inputs: vec![DeclarationId(1969), DeclarationId(1970), DeclarationId(905)],
+                output: DeclarationId(1971),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)),
             },
             type_params: vec![DeclarationId(904), DeclarationId(905)],
@@ -24056,8 +24068,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(906),
             name: Some("div_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1969), DeclarationId(1970), DeclarationId(908)],
-                output: DeclarationId(1971),
+                inputs: vec![DeclarationId(1972), DeclarationId(1973), DeclarationId(908)],
+                output: DeclarationId(1974),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)),
             },
             type_params: vec![DeclarationId(907), DeclarationId(908)],
@@ -24121,7 +24133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(1988),
+                        ty: DeclarationId(1991),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -24183,11 +24195,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BoundUnspecified".to_string(),
-                        ty: DeclarationId(1989),
+                        ty: DeclarationId(1992),
                     },
                     Field {
                         label: "StaticBoundFact".to_string(),
-                        ty: DeclarationId(1990),
+                        ty: DeclarationId(1993),
                     },
                 ],
             },
@@ -24237,11 +24249,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DirectField".to_string(),
-                        ty: DeclarationId(1991),
+                        ty: DeclarationId(1994),
                     },
                     Field {
                         label: "AccessorMethod".to_string(),
-                        ty: DeclarationId(1992),
+                        ty: DeclarationId(1995),
                     },
                 ],
             },
@@ -24344,7 +24356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "parameters".to_string(),
-                        ty: DeclarationId(1993),
+                        ty: DeclarationId(1996),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -24394,11 +24406,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(1994),
+                        ty: DeclarationId(1997),
                     },
                     Field {
                         label: "Consumed".to_string(),
-                        ty: DeclarationId(1995),
+                        ty: DeclarationId(1998),
                     },
                 ],
             },
@@ -24419,11 +24431,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Owned".to_string(),
-                        ty: DeclarationId(1996),
+                        ty: DeclarationId(1999),
                     },
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(1997),
+                        ty: DeclarationId(2000),
                     },
                 ],
             },
@@ -24444,11 +24456,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SelfContained".to_string(),
-                        ty: DeclarationId(1998),
+                        ty: DeclarationId(2001),
                     },
                     Field {
                         label: "Caller".to_string(),
-                        ty: DeclarationId(1999),
+                        ty: DeclarationId(2002),
                     },
                 ],
             },
@@ -24469,15 +24481,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Growable".to_string(),
-                        ty: DeclarationId(2000),
+                        ty: DeclarationId(2003),
                     },
                     Field {
                         label: "Fixed".to_string(),
-                        ty: DeclarationId(2001),
+                        ty: DeclarationId(2004),
                     },
                     Field {
                         label: "NotApplicable".to_string(),
-                        ty: DeclarationId(2002),
+                        ty: DeclarationId(2005),
                     },
                 ],
             },
@@ -24497,7 +24509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Utf8FreeMonoidChar".to_string(),
-                    ty: DeclarationId(2003),
+                    ty: DeclarationId(2006),
                 }],
             },
             type_params: vec![],
@@ -24595,43 +24607,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ListEmpty".to_string(),
-                        ty: DeclarationId(2004),
+                        ty: DeclarationId(2007),
                     },
                     Field {
                         label: "ListSingleton".to_string(),
-                        ty: DeclarationId(2005),
+                        ty: DeclarationId(2008),
                     },
                     Field {
                         label: "ListCons".to_string(),
-                        ty: DeclarationId(2006),
+                        ty: DeclarationId(2009),
                     },
                     Field {
                         label: "ListConcat".to_string(),
-                        ty: DeclarationId(2007),
+                        ty: DeclarationId(2010),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2008),
+                        ty: DeclarationId(2011),
                     },
                     Field {
                         label: "ListIsEmpty".to_string(),
-                        ty: DeclarationId(2009),
+                        ty: DeclarationId(2012),
                     },
                     Field {
                         label: "ListFold".to_string(),
-                        ty: DeclarationId(2010),
+                        ty: DeclarationId(2013),
                     },
                     Field {
                         label: "ListMap".to_string(),
-                        ty: DeclarationId(2011),
+                        ty: DeclarationId(2014),
                     },
                     Field {
                         label: "ListFilter".to_string(),
-                        ty: DeclarationId(2012),
+                        ty: DeclarationId(2015),
                     },
                     Field {
                         label: "ListContains".to_string(),
-                        ty: DeclarationId(2013),
+                        ty: DeclarationId(2016),
                     },
                 ],
             },
@@ -24713,11 +24725,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PlaceholderPatternStrategy".to_string(),
-                        ty: DeclarationId(2014),
+                        ty: DeclarationId(2017),
                     },
                     Field {
                         label: "VectorList".to_string(),
-                        ty: DeclarationId(2015),
+                        ty: DeclarationId(2018),
                     },
                 ],
             },
@@ -25180,11 +25192,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Borrow".to_string(),
-                        ty: DeclarationId(2016),
+                        ty: DeclarationId(2019),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(2017),
+                        ty: DeclarationId(2020),
                     },
                 ],
             },
@@ -25205,11 +25217,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CopyOrClone".to_string(),
-                        ty: DeclarationId(2018),
+                        ty: DeclarationId(2021),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(2019),
+                        ty: DeclarationId(2022),
                     },
                 ],
             },
@@ -25295,11 +25307,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IndexedArgs".to_string(),
-                        ty: DeclarationId(2020),
+                        ty: DeclarationId(2023),
                     },
                     Field {
                         label: "NamedArg".to_string(),
-                        ty: DeclarationId(2021),
+                        ty: DeclarationId(2024),
                     },
                 ],
             },
@@ -25320,11 +25332,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SingleTemplate".to_string(),
-                        ty: DeclarationId(2022),
+                        ty: DeclarationId(2025),
                     },
                     Field {
                         label: "HigherOrderTemplates".to_string(),
-                        ty: DeclarationId(2023),
+                        ty: DeclarationId(2026),
                     },
                 ],
             },
@@ -25526,7 +25538,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({left}, {right}...)".to_string(),
                             ))],
@@ -25539,7 +25551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -25577,7 +25589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "int64(len({recv}))".to_string(),
                             ))],
@@ -25590,7 +25602,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -25628,7 +25640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv}) == 0".to_string(),
                             ))],
@@ -25641,7 +25653,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -25681,7 +25693,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* fold({recv}, {init}, {body}) */".to_string(),
                             ))],
@@ -25694,7 +25706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -25716,7 +25728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2024)),
+            meta_tag: Some(DeclarationId(2027)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -25735,7 +25747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -25748,7 +25760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -25770,7 +25782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Join({recv}, {arg})".to_string(),
                             ))],
@@ -25783,7 +25795,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -25805,7 +25817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Split({recv}, {arg})".to_string(),
                             ))],
@@ -25818,7 +25830,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -25840,7 +25852,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Map({recv}, {arg})".to_string(),
                             ))],
@@ -25853,7 +25865,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -25875,7 +25887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Filter({recv}, {arg})".to_string(),
                             ))],
@@ -25888,7 +25900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -25910,7 +25922,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Any({recv}, {arg})".to_string(),
                             ))],
@@ -25923,7 +25935,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -25945,7 +25957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.All({recv}, {arg})".to_string(),
                             ))],
@@ -25958,7 +25970,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -25980,7 +25992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.FlatMap({recv}, {arg})".to_string(),
                             ))],
@@ -25993,7 +26005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -26013,7 +26025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -26026,7 +26038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -26046,7 +26058,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -26059,7 +26071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -26081,7 +26093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.SortBy({recv}, {arg})".to_string(),
                             ))],
@@ -26094,7 +26106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -26116,7 +26128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({recv}, {arg})".to_string(),
                             ))],
@@ -26129,7 +26141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -26151,7 +26163,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Contains({recv}, {arg})".to_string(),
                             ))],
@@ -26164,7 +26176,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -26181,23 +26193,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DirectRecursion".to_string(),
-                        ty: DeclarationId(2034),
+                        ty: DeclarationId(2037),
                     },
                     Field {
                         label: "ListRecursion".to_string(),
-                        ty: DeclarationId(2035),
+                        ty: DeclarationId(2038),
                     },
                     Field {
                         label: "OptionalRecursion".to_string(),
-                        ty: DeclarationId(2036),
+                        ty: DeclarationId(2039),
                     },
                     Field {
                         label: "SetRecursion".to_string(),
-                        ty: DeclarationId(2037),
+                        ty: DeclarationId(2040),
                     },
                     Field {
                         label: "MapValueRecursion".to_string(),
-                        ty: DeclarationId(2038),
+                        ty: DeclarationId(2041),
                     },
                 ],
             },
@@ -26309,23 +26321,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "StrictSubValue".to_string(),
-                        ty: DeclarationId(2039),
+                        ty: DeclarationId(2042),
                     },
                     Field {
                         label: "IteratedSubValue".to_string(),
-                        ty: DeclarationId(2040),
+                        ty: DeclarationId(2043),
                     },
                     Field {
                         label: "ArithmeticDescent".to_string(),
-                        ty: DeclarationId(2041),
+                        ty: DeclarationId(2044),
                     },
                     Field {
                         label: "PreservedValue".to_string(),
-                        ty: DeclarationId(2042),
+                        ty: DeclarationId(2045),
                     },
                     Field {
                         label: "SubValueUnknown".to_string(),
-                        ty: DeclarationId(2043),
+                        ty: DeclarationId(2046),
                     },
                 ],
             },
@@ -26476,7 +26488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("sub_value_to_call_pattern".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(961)],
-                output: DeclarationId(2025),
+                output: DeclarationId(2028),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     20518,
@@ -26498,7 +26510,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("sub_value_to_lowering_target".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(961)],
-                output: DeclarationId(2026),
+                output: DeclarationId(2029),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     21906,
@@ -26522,19 +26534,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IntegerExpZero".to_string(),
-                        ty: DeclarationId(2044),
+                        ty: DeclarationId(2047),
                     },
                     Field {
                         label: "IntegerExpPos".to_string(),
-                        ty: DeclarationId(2045),
+                        ty: DeclarationId(2048),
                     },
                     Field {
                         label: "FractionExp".to_string(),
-                        ty: DeclarationId(2046),
+                        ty: DeclarationId(2049),
                     },
                     Field {
                         label: "LogBasedExp".to_string(),
-                        ty: DeclarationId(2047),
+                        ty: DeclarationId(2050),
                     },
                 ],
             },
@@ -26577,11 +26589,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PolyCost".to_string(),
-                        ty: DeclarationId(2048),
+                        ty: DeclarationId(2051),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(2049),
+                        ty: DeclarationId(2052),
                     },
                 ],
             },
@@ -26602,31 +26614,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ConstantBound".to_string(),
-                        ty: DeclarationId(2050),
+                        ty: DeclarationId(2053),
                     },
                     Field {
                         label: "AtomicBound".to_string(),
-                        ty: DeclarationId(2051),
+                        ty: DeclarationId(2054),
                     },
                     Field {
                         label: "ProductBound".to_string(),
-                        ty: DeclarationId(2053),
+                        ty: DeclarationId(2056),
                     },
                     Field {
                         label: "SumOfProductsBound".to_string(),
-                        ty: DeclarationId(2056),
+                        ty: DeclarationId(2059),
                     },
                     Field {
                         label: "SumBound".to_string(),
-                        ty: DeclarationId(2058),
+                        ty: DeclarationId(2061),
                     },
                     Field {
                         label: "ForeverBound".to_string(),
-                        ty: DeclarationId(2059),
+                        ty: DeclarationId(2062),
                     },
                     Field {
                         label: "ErrorBound".to_string(),
-                        ty: DeclarationId(2060),
+                        ty: DeclarationId(2063),
                     },
                 ],
             },
@@ -26644,7 +26656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(974),
             name: Some("sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2027)],
+                inputs: vec![DeclarationId(2030)],
                 output: DeclarationId(973),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -26920,7 +26932,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("int_add_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(2028),
+                output: DeclarationId(2031),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     31955,
@@ -26942,7 +26954,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("int_mul_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(2029),
+                output: DeclarationId(2032),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     32251,
@@ -26964,7 +26976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("bounded_int_pow_exponent".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2030),
+                output: DeclarationId(2033),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33500,
@@ -26986,7 +26998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("int_pow_bounded".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(2031),
+                output: DeclarationId(2034),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33975,
@@ -27008,7 +27020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("ceil_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(2032),
+                output: DeclarationId(2035),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35238,
@@ -27035,7 +27047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     DeclarationId(81),
                     DeclarationId(81),
                 ],
-                output: DeclarationId(2033),
+                output: DeclarationId(2036),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35510,
@@ -27443,7 +27455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2061)),
+            meta_tag: Some(DeclarationId(2064)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -27469,7 +27481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2062)),
+            meta_tag: Some(DeclarationId(2065)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -27494,23 +27506,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(2064),
+                        ty: DeclarationId(2067),
                     },
                     Field {
                         label: "sequential".to_string(),
-                        ty: DeclarationId(2065),
+                        ty: DeclarationId(2068),
                     },
                     Field {
                         label: "branch".to_string(),
-                        ty: DeclarationId(2066),
+                        ty: DeclarationId(2069),
                     },
                     Field {
                         label: "iterate".to_string(),
-                        ty: DeclarationId(2067),
+                        ty: DeclarationId(2070),
                     },
                     Field {
                         label: "validate".to_string(),
-                        ty: DeclarationId(2068),
+                        ty: DeclarationId(2071),
                     },
                 ],
             },
@@ -27545,11 +27557,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Miss".to_string(),
-                        ty: DeclarationId(2071),
+                        ty: DeclarationId(2074),
                     },
                     Field {
                         label: "Hit".to_string(),
-                        ty: DeclarationId(2072),
+                        ty: DeclarationId(2075),
                     },
                 ],
             },
@@ -27582,7 +27594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("miss_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2069),
+                output: DeclarationId(2072),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4589, 4599)),
             },
             type_params: vec![],
@@ -27600,7 +27612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("hit_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2070),
+                output: DeclarationId(2073),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4642, 4654)),
             },
             type_params: vec![],
@@ -27638,7 +27650,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "items".to_string(),
-                    ty: DeclarationId(2073),
+                    ty: DeclarationId(2076),
                 }],
             },
             type_params: vec![],
@@ -27666,7 +27678,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "refinement".to_string(),
-                        ty: DeclarationId(2074),
+                        ty: DeclarationId(2077),
                     },
                 ],
             },
@@ -27741,11 +27753,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Positional".to_string(),
-                        ty: DeclarationId(2076),
+                        ty: DeclarationId(2079),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(2078),
+                        ty: DeclarationId(2081),
                     },
                 ],
             },
@@ -27766,19 +27778,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Named".to_string(),
-                        ty: DeclarationId(2079),
+                        ty: DeclarationId(2082),
                     },
                     Field {
                         label: "Parameterized".to_string(),
-                        ty: DeclarationId(2081),
+                        ty: DeclarationId(2084),
                     },
                     Field {
                         label: "Optional".to_string(),
-                        ty: DeclarationId(2082),
+                        ty: DeclarationId(2085),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2084),
+                        ty: DeclarationId(2087),
                     },
                 ],
             },
@@ -27919,15 +27931,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BareVariant".to_string(),
-                        ty: DeclarationId(2085),
+                        ty: DeclarationId(2088),
                     },
                     Field {
                         label: "VariantWith".to_string(),
-                        ty: DeclarationId(2086),
+                        ty: DeclarationId(2089),
                     },
                     Field {
                         label: "VariantFields".to_string(),
-                        ty: DeclarationId(2088),
+                        ty: DeclarationId(2091),
                     },
                 ],
             },
@@ -27948,15 +27960,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Int".to_string(),
-                        ty: DeclarationId(2089),
+                        ty: DeclarationId(2092),
                     },
                     Field {
                         label: "Bool".to_string(),
-                        ty: DeclarationId(2090),
+                        ty: DeclarationId(2093),
                     },
                     Field {
                         label: "String".to_string(),
-                        ty: DeclarationId(2091),
+                        ty: DeclarationId(2094),
                     },
                 ],
             },
@@ -27977,51 +27989,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(2092),
+                        ty: DeclarationId(2095),
                     },
                     Field {
                         label: "Var".to_string(),
-                        ty: DeclarationId(2093),
+                        ty: DeclarationId(2096),
                     },
                     Field {
                         label: "Path".to_string(),
-                        ty: DeclarationId(2096),
+                        ty: DeclarationId(2099),
                     },
                     Field {
                         label: "Call".to_string(),
-                        ty: DeclarationId(2098),
+                        ty: DeclarationId(2101),
                     },
                     Field {
                         label: "VariantRecord".to_string(),
-                        ty: DeclarationId(2100),
+                        ty: DeclarationId(2103),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(2102),
+                        ty: DeclarationId(2105),
                     },
                     Field {
                         label: "Lambda".to_string(),
-                        ty: DeclarationId(2104),
+                        ty: DeclarationId(2107),
                     },
                     Field {
                         label: "If".to_string(),
-                        ty: DeclarationId(2105),
+                        ty: DeclarationId(2108),
                     },
                     Field {
                         label: "Match".to_string(),
-                        ty: DeclarationId(2107),
+                        ty: DeclarationId(2110),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(2109),
+                        ty: DeclarationId(2112),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(2111),
+                        ty: DeclarationId(2114),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(2113),
+                        ty: DeclarationId(2116),
                     },
                 ],
             },
@@ -28042,43 +28054,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Let".to_string(),
-                        ty: DeclarationId(2115),
+                        ty: DeclarationId(2118),
                     },
                     Field {
                         label: "Fn".to_string(),
-                        ty: DeclarationId(2118),
+                        ty: DeclarationId(2121),
                     },
                     Field {
                         label: "FnExternalBody".to_string(),
-                        ty: DeclarationId(2121),
+                        ty: DeclarationId(2124),
                     },
                     Field {
                         label: "Data".to_string(),
-                        ty: DeclarationId(2123),
+                        ty: DeclarationId(2126),
                     },
                     Field {
                         label: "Module".to_string(),
-                        ty: DeclarationId(2125),
+                        ty: DeclarationId(2128),
                     },
                     Field {
                         label: "Import".to_string(),
-                        ty: DeclarationId(2128),
+                        ty: DeclarationId(2131),
                     },
                     Field {
                         label: "TypeAtom".to_string(),
-                        ty: DeclarationId(2130),
+                        ty: DeclarationId(2133),
                     },
                     Field {
                         label: "TypeRecord".to_string(),
-                        ty: DeclarationId(2133),
+                        ty: DeclarationId(2136),
                     },
                     Field {
                         label: "TypeSum".to_string(),
-                        ty: DeclarationId(2137),
+                        ty: DeclarationId(2140),
                     },
                     Field {
                         label: "TypeAlias".to_string(),
-                        ty: DeclarationId(2140),
+                        ty: DeclarationId(2143),
                     },
                 ],
             },
@@ -28120,7 +28132,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[*{left}, *{right}]".to_string(),
                             ))],
@@ -28133,7 +28145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -28175,7 +28187,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -28188,7 +28200,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -28230,7 +28242,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "(len({recv}) == 0)".to_string(),
                             ))],
@@ -28243,7 +28255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -28287,7 +28299,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "__v3_fold({recv}, {init}, {body})".to_string(),
                             ))],
@@ -28300,7 +28312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -28326,7 +28338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2141)),
+            meta_tag: Some(DeclarationId(2144)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -28345,7 +28357,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -28358,7 +28370,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -28378,7 +28390,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg}.join({recv})".to_string(),
                             ))],
@@ -28391,7 +28403,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -28411,7 +28423,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}.split({arg})".to_string(),
                             ))],
@@ -28424,7 +28436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -28446,7 +28458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[-1] if {recv} else None".to_string(),
                             ))],
@@ -28459,7 +28471,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -28481,7 +28493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[0] if {recv} else None".to_string(),
                             ))],
@@ -28494,7 +28506,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -28516,7 +28528,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "list(enumerate({recv}))".to_string(),
                             ))],
@@ -28529,7 +28541,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -28551,7 +28563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[ord(c) for c in {recv}]".to_string(),
                             ))],
@@ -28564,7 +28576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -28586,7 +28598,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[{arg}(x) for x in {recv}]".to_string(),
                             ))],
@@ -28599,7 +28611,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -28621,7 +28633,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[x for x in {recv} if {arg}(x)]".to_string(),
                             ))],
@@ -28634,7 +28646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -28656,7 +28668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "any({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -28669,7 +28681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -28691,7 +28703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "all({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -28704,7 +28716,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -28726,7 +28738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[y for x in {recv} for y in {arg}(x)]".to_string(),
                             ))],
@@ -28739,7 +28751,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -28759,7 +28771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -28772,7 +28784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -28792,7 +28804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -28805,7 +28817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -28827,7 +28839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "sorted({recv}, key={arg})".to_string(),
                             ))],
@@ -28840,7 +28852,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -28860,7 +28872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv} + [{arg}]".to_string(),
                             ))],
@@ -28873,7 +28885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -28893,7 +28905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg} in {recv}".to_string(),
                             ))],
@@ -28906,7 +28918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -29004,23 +29016,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LiteralValue".to_string(),
-                        ty: DeclarationId(2142),
+                        ty: DeclarationId(2145),
                     },
                     Field {
                         label: "RecordValue".to_string(),
-                        ty: DeclarationId(2144),
+                        ty: DeclarationId(2147),
                     },
                     Field {
                         label: "VariantValue".to_string(),
-                        ty: DeclarationId(2145),
+                        ty: DeclarationId(2148),
                     },
                     Field {
                         label: "NodeRef".to_string(),
-                        ty: DeclarationId(2146),
+                        ty: DeclarationId(2149),
                     },
                     Field {
                         label: "CardinalityValue".to_string(),
-                        ty: DeclarationId(2147),
+                        ty: DeclarationId(2150),
                     },
                 ],
             },
@@ -29073,7 +29085,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bindings".to_string(),
-                    ty: DeclarationId(2148),
+                    ty: DeclarationId(2151),
                 }],
             },
             type_params: vec![],
@@ -29092,7 +29104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "frames".to_string(),
-                    ty: DeclarationId(2149),
+                    ty: DeclarationId(2152),
                 }],
             },
             type_params: vec![],
@@ -29130,7 +29142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "ApplicativeOrder".to_string(),
-                    ty: DeclarationId(2150),
+                    ty: DeclarationId(2153),
                 }],
             },
             type_params: vec![],
@@ -29149,7 +29161,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LeftFirst".to_string(),
-                    ty: DeclarationId(2151),
+                    ty: DeclarationId(2154),
                 }],
             },
             type_params: vec![],
@@ -29195,7 +29207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/runtime.dag", 6042, 6153),
         });
-        declarations.push(Declaration { id: DeclarationId(1049), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(607), arguments: vec![TemplateArgument { parameter: DeclarationId(608), value: DeclarationId(947) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2152)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2022), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2021), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(238)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2022), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2021), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2022), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2021), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(240)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2022), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2021), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2022), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2021), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2022), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2021), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2022), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2021), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2023), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2021), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2023), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2021), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2023), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2021), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2023), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2021), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(260)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2022), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2021), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(266)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2022), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2021), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) });
+        declarations.push(Declaration { id: DeclarationId(1049), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(607), arguments: vec![TemplateArgument { parameter: DeclarationId(608), value: DeclarationId(947) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2155)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(238)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(240)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2026), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2026), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2026), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2026), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(260)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(266)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) });
         declarations.push(Declaration {
             id: DeclarationId(1050),
             name: Some("InputField".to_string()),
@@ -29265,7 +29277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2153),
+                        ty: DeclarationId(2156),
                     },
                     Field {
                         label: "endpoint".to_string(),
@@ -29290,15 +29302,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Strict".to_string(),
-                        ty: DeclarationId(2161),
+                        ty: DeclarationId(2164),
                     },
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2162),
+                        ty: DeclarationId(2165),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2163),
+                        ty: DeclarationId(2166),
                     },
                 ],
             },
@@ -29396,8 +29408,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1059),
             name: Some("optional_evidence_meet".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2154), DeclarationId(2155)],
-                output: DeclarationId(2156),
+                inputs: vec![DeclarationId(2157), DeclarationId(2158)],
+                output: DeclarationId(2159),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2388,
@@ -29418,8 +29430,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1060),
             name: Some("map_evidence_merge_at".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2157), DeclarationId(197), DeclarationId(1054)],
-                output: DeclarationId(2158),
+                inputs: vec![DeclarationId(2160), DeclarationId(197), DeclarationId(1054)],
+                output: DeclarationId(2161),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2733,
@@ -29443,23 +29455,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2164),
+                        ty: DeclarationId(2167),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2165),
+                        ty: DeclarationId(2168),
                     },
                     Field {
                         label: "ArithmeticValue".to_string(),
-                        ty: DeclarationId(2166),
+                        ty: DeclarationId(2169),
                     },
                     Field {
                         label: "TokenPosition".to_string(),
-                        ty: DeclarationId(2167),
+                        ty: DeclarationId(2170),
                     },
                     Field {
                         label: "SetCardinality".to_string(),
-                        ty: DeclarationId(2168),
+                        ty: DeclarationId(2171),
                     },
                 ],
             },
@@ -29480,11 +29492,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OneStep".to_string(),
-                        ty: DeclarationId(2169),
+                        ty: DeclarationId(2172),
                     },
                     Field {
                         label: "AdditionalStep".to_string(),
-                        ty: DeclarationId(2170),
+                        ty: DeclarationId(2173),
                     },
                 ],
             },
@@ -29505,11 +29517,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DivideByTwo".to_string(),
-                        ty: DeclarationId(2171),
+                        ty: DeclarationId(2174),
                     },
                     Field {
                         label: "StrictlyLarger".to_string(),
-                        ty: DeclarationId(2172),
+                        ty: DeclarationId(2175),
                     },
                 ],
             },
@@ -29572,7 +29584,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("positive_descent_amount_from_positive_int".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2159),
+                output: DeclarationId(2162),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     5902,
@@ -29594,7 +29606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("proportional_divisor_from_int_at_least_two".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2160),
+                output: DeclarationId(2163),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6342,
@@ -29618,31 +29630,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ChildAccessor".to_string(),
-                        ty: DeclarationId(2173),
+                        ty: DeclarationId(2176),
                     },
                     Field {
                         label: "ListShrink".to_string(),
-                        ty: DeclarationId(2174),
+                        ty: DeclarationId(2177),
                     },
                     Field {
                         label: "ArithmeticSubtractDescent".to_string(),
-                        ty: DeclarationId(2175),
+                        ty: DeclarationId(2178),
                     },
                     Field {
                         label: "ArithmeticDivideDescent".to_string(),
-                        ty: DeclarationId(2176),
+                        ty: DeclarationId(2179),
                     },
                     Field {
                         label: "ParserAdvance".to_string(),
-                        ty: DeclarationId(2177),
+                        ty: DeclarationId(2180),
                     },
                     Field {
                         label: "SetRemoval".to_string(),
-                        ty: DeclarationId(2178),
+                        ty: DeclarationId(2181),
                     },
                     Field {
                         label: "FoldIteration".to_string(),
-                        ty: DeclarationId(2179),
+                        ty: DeclarationId(2182),
                     },
                 ],
             },
@@ -29662,7 +29674,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "dimensions".to_string(),
-                    ty: DeclarationId(2180),
+                    ty: DeclarationId(2183),
                 }],
             },
             type_params: vec![],
@@ -29690,7 +29702,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(2181),
+                        ty: DeclarationId(2184),
                     },
                 ],
             },
@@ -29711,183 +29723,183 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2182),
+                        ty: DeclarationId(2185),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2183),
+                        ty: DeclarationId(2186),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2184),
+                        ty: DeclarationId(2187),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2185),
+                        ty: DeclarationId(2188),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2186),
+                        ty: DeclarationId(2189),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2187),
+                        ty: DeclarationId(2190),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2188),
+                        ty: DeclarationId(2191),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2189),
+                        ty: DeclarationId(2192),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2190),
+                        ty: DeclarationId(2193),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2191),
+                        ty: DeclarationId(2194),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2192),
+                        ty: DeclarationId(2195),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2193),
+                        ty: DeclarationId(2196),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2194),
+                        ty: DeclarationId(2197),
                     },
                     Field {
                         label: "Ident".to_string(),
-                        ty: DeclarationId(2195),
+                        ty: DeclarationId(2198),
                     },
                     Field {
                         label: "IntLit".to_string(),
-                        ty: DeclarationId(2196),
+                        ty: DeclarationId(2199),
                     },
                     Field {
                         label: "StringLit".to_string(),
-                        ty: DeclarationId(2197),
+                        ty: DeclarationId(2200),
                     },
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2198),
+                        ty: DeclarationId(2201),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2199),
+                        ty: DeclarationId(2202),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2200),
+                        ty: DeclarationId(2203),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2201),
+                        ty: DeclarationId(2204),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2202),
+                        ty: DeclarationId(2205),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2203),
+                        ty: DeclarationId(2206),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2204),
+                        ty: DeclarationId(2207),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2205),
+                        ty: DeclarationId(2208),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2206),
+                        ty: DeclarationId(2209),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2207),
+                        ty: DeclarationId(2210),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2208),
+                        ty: DeclarationId(2211),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2209),
+                        ty: DeclarationId(2212),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2210),
+                        ty: DeclarationId(2213),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2211),
+                        ty: DeclarationId(2214),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2212),
+                        ty: DeclarationId(2215),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2213),
+                        ty: DeclarationId(2216),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2214),
+                        ty: DeclarationId(2217),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2215),
+                        ty: DeclarationId(2218),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2216),
+                        ty: DeclarationId(2219),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2217),
+                        ty: DeclarationId(2220),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2218),
+                        ty: DeclarationId(2221),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2219),
+                        ty: DeclarationId(2222),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2220),
+                        ty: DeclarationId(2223),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2221),
+                        ty: DeclarationId(2224),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2222),
+                        ty: DeclarationId(2225),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2223),
+                        ty: DeclarationId(2226),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2224),
+                        ty: DeclarationId(2227),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2225),
+                        ty: DeclarationId(2228),
                     },
                     Field {
                         label: "Eof".to_string(),
-                        ty: DeclarationId(2226),
+                        ty: DeclarationId(2229),
                     },
                 ],
             },
@@ -29933,55 +29945,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2227),
+                        ty: DeclarationId(2230),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2228),
+                        ty: DeclarationId(2231),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2229),
+                        ty: DeclarationId(2232),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2230),
+                        ty: DeclarationId(2233),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2231),
+                        ty: DeclarationId(2234),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2232),
+                        ty: DeclarationId(2235),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2233),
+                        ty: DeclarationId(2236),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2234),
+                        ty: DeclarationId(2237),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2235),
+                        ty: DeclarationId(2238),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2236),
+                        ty: DeclarationId(2239),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2237),
+                        ty: DeclarationId(2240),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2238),
+                        ty: DeclarationId(2241),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2239),
+                        ty: DeclarationId(2242),
                     },
                 ],
             },
@@ -30002,115 +30014,115 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2240),
+                        ty: DeclarationId(2243),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2241),
+                        ty: DeclarationId(2244),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2242),
+                        ty: DeclarationId(2245),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2243),
+                        ty: DeclarationId(2246),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2244),
+                        ty: DeclarationId(2247),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2245),
+                        ty: DeclarationId(2248),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2246),
+                        ty: DeclarationId(2249),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2247),
+                        ty: DeclarationId(2250),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2248),
+                        ty: DeclarationId(2251),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2249),
+                        ty: DeclarationId(2252),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2250),
+                        ty: DeclarationId(2253),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2251),
+                        ty: DeclarationId(2254),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2252),
+                        ty: DeclarationId(2255),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2253),
+                        ty: DeclarationId(2256),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2254),
+                        ty: DeclarationId(2257),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2255),
+                        ty: DeclarationId(2258),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2256),
+                        ty: DeclarationId(2259),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2257),
+                        ty: DeclarationId(2260),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2258),
+                        ty: DeclarationId(2261),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2259),
+                        ty: DeclarationId(2262),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2260),
+                        ty: DeclarationId(2263),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2261),
+                        ty: DeclarationId(2264),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2262),
+                        ty: DeclarationId(2265),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2263),
+                        ty: DeclarationId(2266),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2264),
+                        ty: DeclarationId(2267),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2265),
+                        ty: DeclarationId(2268),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2266),
+                        ty: DeclarationId(2269),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2267),
+                        ty: DeclarationId(2270),
                     },
                 ],
             },
@@ -30325,31 +30337,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2271),
+                        ty: DeclarationId(2274),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2272),
+                        ty: DeclarationId(2275),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2273),
+                        ty: DeclarationId(2276),
+                    },
+                    Field {
+                        label: "ArityMismatch".to_string(),
+                        ty: DeclarationId(2277),
+                    },
+                    Field {
+                        label: "ResolveError".to_string(),
+                        ty: DeclarationId(2278),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2274),
+                        ty: DeclarationId(2279),
                     },
                     Field {
-                        label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2275),
+                        label: "BranchConditionNotBool".to_string(),
+                        ty: DeclarationId(2280),
                     },
                     Field {
-                        label: "ResolveError".to_string(),
-                        ty: DeclarationId(2276),
+                        label: "MagnitudeOutOfRange".to_string(),
+                        ty: DeclarationId(2281),
+                    },
+                    Field {
+                        label: "MalformedIntegerRangeFact".to_string(),
+                        ty: DeclarationId(2282),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2277),
+                        ty: DeclarationId(2283),
                     },
                 ],
             },
@@ -30361,7 +30385,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2456, 2606),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2456, 2687),
         });
         declarations.push(Declaration {
             id: DeclarationId(1087),
@@ -30370,11 +30394,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "AnyDetail".to_string(),
-                        ty: DeclarationId(2278),
+                        ty: DeclarationId(2284),
                     },
                     Field {
                         label: "Contains".to_string(),
-                        ty: DeclarationId(2279),
+                        ty: DeclarationId(2285),
                     },
                 ],
             },
@@ -30386,7 +30410,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2975, 3042),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3056, 3123),
         });
         declarations.push(Declaration {
             id: DeclarationId(1088),
@@ -30411,7 +30435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3186, 3284),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3267, 3365),
         });
         declarations.push(Declaration {
             id: DeclarationId(1089),
@@ -30420,11 +30444,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(2280),
+                        ty: DeclarationId(2286),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(2281),
+                        ty: DeclarationId(2287),
                     },
                 ],
             },
@@ -30436,7 +30460,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3671, 3724),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3752, 3805),
         });
         declarations.push(Declaration {
             id: DeclarationId(1090),
@@ -30445,15 +30469,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Associativity".to_string(),
-                        ty: DeclarationId(2282),
+                        ty: DeclarationId(2288),
                     },
                     Field {
                         label: "Commutativity".to_string(),
-                        ty: DeclarationId(2283),
+                        ty: DeclarationId(2289),
                     },
                     Field {
                         label: "Identity".to_string(),
-                        ty: DeclarationId(2284),
+                        ty: DeclarationId(2290),
                     },
                 ],
             },
@@ -30465,7 +30489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4513, 4583),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4594, 4664),
         });
         declarations.push(Declaration {
             id: DeclarationId(1091),
@@ -30474,95 +30498,95 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Compiles".to_string(),
-                        ty: DeclarationId(2285),
+                        ty: DeclarationId(2291),
                     },
                     Field {
                         label: "FailsWithDiagnostic".to_string(),
-                        ty: DeclarationId(2286),
+                        ty: DeclarationId(2292),
                     },
                     Field {
                         label: "OutputEquals".to_string(),
-                        ty: DeclarationId(2287),
+                        ty: DeclarationId(2293),
                     },
                     Field {
                         label: "PortHasState".to_string(),
-                        ty: DeclarationId(2288),
+                        ty: DeclarationId(2294),
                     },
                     Field {
                         label: "DeclarationHasRefinement".to_string(),
-                        ty: DeclarationId(2289),
+                        ty: DeclarationId(2295),
                     },
                     Field {
                         label: "CostBounded".to_string(),
-                        ty: DeclarationId(2290),
+                        ty: DeclarationId(2296),
                     },
                     Field {
                         label: "BehavioralObservation".to_string(),
-                        ty: DeclarationId(2291),
+                        ty: DeclarationId(2297),
                     },
                     Field {
                         label: "MockBackedInvariant".to_string(),
-                        ty: DeclarationId(2292),
+                        ty: DeclarationId(2298),
                     },
                     Field {
                         label: "ExecuteCommand".to_string(),
-                        ty: DeclarationId(2294),
+                        ty: DeclarationId(2300),
                     },
                     Field {
                         label: "ForAllTargets".to_string(),
-                        ty: DeclarationId(2296),
+                        ty: DeclarationId(2302),
                     },
                     Field {
                         label: "LensOutputEquals".to_string(),
-                        ty: DeclarationId(2297),
+                        ty: DeclarationId(2303),
                     },
                     Field {
                         label: "DifferentialEquals".to_string(),
-                        ty: DeclarationId(2298),
+                        ty: DeclarationId(2304),
                     },
                     Field {
                         label: "SymbolicCostExprEquals".to_string(),
-                        ty: DeclarationId(2299),
+                        ty: DeclarationId(2305),
                     },
                     Field {
                         label: "BinaryDimensionReportEquals".to_string(),
-                        ty: DeclarationId(2300),
+                        ty: DeclarationId(2306),
                     },
                     Field {
                         label: "AlgebraicLaw".to_string(),
-                        ty: DeclarationId(2301),
+                        ty: DeclarationId(2307),
                     },
                     Field {
                         label: "CensusBoundCheck".to_string(),
-                        ty: DeclarationId(2302),
+                        ty: DeclarationId(2308),
                     },
                     Field {
                         label: "CensusSubsetCount".to_string(),
-                        ty: DeclarationId(2303),
+                        ty: DeclarationId(2309),
                     },
                     Field {
                         label: "FixedPointConverges".to_string(),
-                        ty: DeclarationId(2304),
+                        ty: DeclarationId(2310),
                     },
                     Field {
                         label: "RatchetZero".to_string(),
-                        ty: DeclarationId(2305),
+                        ty: DeclarationId(2311),
                     },
                     Field {
                         label: "GeneratedFromDag".to_string(),
-                        ty: DeclarationId(2307),
+                        ty: DeclarationId(2313),
                     },
                     Field {
                         label: "ReleaseDeferredClaim".to_string(),
-                        ty: DeclarationId(2308),
+                        ty: DeclarationId(2314),
                     },
                     Field {
                         label: "SubstrateResearchDeferredClaim".to_string(),
-                        ty: DeclarationId(2309),
+                        ty: DeclarationId(2315),
                     },
                     Field {
                         label: "BridgeLedgerZero".to_string(),
-                        ty: DeclarationId(2310),
+                        ty: DeclarationId(2316),
                     },
                 ],
             },
@@ -30574,7 +30598,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4585, 14920),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4666, 15001),
         });
         declarations.push(Declaration {
             id: DeclarationId(1092),
@@ -30588,7 +30612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15028, 15048),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15109, 15129),
         });
         declarations.push(Declaration {
             id: DeclarationId(1093),
@@ -30607,7 +30631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15191, 15246),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15272, 15327),
         });
         declarations.push(Declaration {
             id: DeclarationId(1094),
@@ -30632,7 +30656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2311),
+                        ty: DeclarationId(2317),
                     },
                 ],
             },
@@ -30644,7 +30668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15856, 15989),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15937, 16070),
         });
         declarations.push(Declaration {
             id: DeclarationId(1095),
@@ -30657,7 +30681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "claims".to_string(),
-                        ty: DeclarationId(2312),
+                        ty: DeclarationId(2318),
                     },
                 ],
             },
@@ -30669,7 +30693,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15991, 16050),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16072, 16131),
         });
         declarations.push(Declaration {
             id: DeclarationId(1096),
@@ -30682,7 +30706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "resources".to_string(),
-                        ty: DeclarationId(2313),
+                        ty: DeclarationId(2319),
                     },
                 ],
             },
@@ -30694,18 +30718,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16248, 16329),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16329, 16410),
         });
         declarations.push(Declaration {
             id: DeclarationId(1097),
             name: Some("claim_obligation_resources".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1094)],
-                output: DeclarationId(2268),
+                output: DeclarationId(2271),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    16771,
-                    16787,
+                    16852,
+                    16868,
                 )),
             },
             type_params: vec![],
@@ -30716,7 +30740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16700, 16787),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16781, 16868),
         });
         declarations.push(Declaration {
             id: DeclarationId(1098),
@@ -30726,8 +30750,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 output: DeclarationId(1096),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    16845,
-                    16930,
+                    16926,
+                    17011,
                 )),
             },
             type_params: vec![],
@@ -30738,18 +30762,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16789, 16930),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16870, 17011),
         });
         declarations.push(Declaration {
             id: DeclarationId(1099),
             name: Some("materialize_test_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2269)],
-                output: DeclarationId(2270),
+                inputs: vec![DeclarationId(2272)],
+                output: DeclarationId(2273),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    17013,
-                    17052,
+                    17094,
+                    17133,
                 )),
             },
             type_params: vec![],
@@ -30760,14 +30784,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16932, 17052),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17013, 17133),
         });
         declarations.push(Declaration {
             id: DeclarationId(1100),
             name: Some("behavior_spine".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(748)],
-                output: DeclarationId(2314),
+                output: DeclarationId(2320),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(280))),
             },
             type_params: vec![],
@@ -31068,7 +31092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1990),
+                            constructor: DeclarationId(1993),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1623),
                                 payload: vec![
@@ -31364,7 +31388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1991),
+                                    constructor: DeclarationId(1994),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -31462,7 +31486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -31481,7 +31505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state".to_string(),
                                         ))],
@@ -31502,7 +31526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -31563,7 +31587,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -31582,7 +31606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -31601,7 +31625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -31892,7 +31916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -31911,7 +31935,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -31974,7 +31998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -31993,7 +32017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -32056,7 +32080,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -32075,7 +32099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -32137,7 +32161,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1991),
+                                    constructor: DeclarationId(1994),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -32197,7 +32221,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -32216,7 +32240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -32277,7 +32301,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -32296,7 +32320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -32357,7 +32381,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -32376,7 +32400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -32395,7 +32419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -32456,7 +32480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1992),
+                                        constructor: DeclarationId(1995),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -32475,7 +32499,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1992),
+                                        constructor: DeclarationId(1995),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -32535,7 +32559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1992),
+                                    constructor: DeclarationId(1995),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -32594,7 +32618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1991),
+                                    constructor: DeclarationId(1994),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -32653,7 +32677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1991),
+                                    constructor: DeclarationId(1994),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -32713,7 +32737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -32734,7 +32758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -32947,7 +32971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -32966,7 +32990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -32987,7 +33011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -33008,7 +33032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -33029,7 +33053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -33050,7 +33074,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -33071,7 +33095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -33092,7 +33116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -33113,7 +33137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -33132,7 +33156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33423,7 +33447,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -33444,7 +33468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -33505,7 +33529,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -33526,7 +33550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33545,7 +33569,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -33564,7 +33588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -33663,7 +33687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33682,7 +33706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -33703,7 +33727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33722,7 +33746,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33783,7 +33807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33802,7 +33826,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -33821,7 +33845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -33842,7 +33866,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33861,7 +33885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33922,7 +33946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33941,7 +33965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -33960,7 +33984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -33981,7 +34005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -34000,7 +34024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -34021,7 +34045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -34082,7 +34106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -34101,7 +34125,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -34120,7 +34144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -34139,7 +34163,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -34158,7 +34182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -34179,7 +34203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -34198,7 +34222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -34259,7 +34283,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -34278,7 +34302,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -34299,7 +34323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -34318,7 +34342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -34337,7 +34361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -34358,7 +34382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -34459,7 +34483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -34478,7 +34502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -34497,7 +34521,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -34518,7 +34542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -34578,7 +34602,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1991),
+                                    constructor: DeclarationId(1994),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -34676,7 +34700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -34695,7 +34719,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -34716,7 +34740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -34777,7 +34801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -34796,7 +34820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -34857,7 +34881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -34876,7 +34900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -34895,7 +34919,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -35032,7 +35056,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -35051,7 +35075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -35070,7 +35094,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -35131,7 +35155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -35152,7 +35176,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -35171,7 +35195,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -35190,7 +35214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -35251,7 +35275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -35270,7 +35294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -35289,7 +35313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -35350,7 +35374,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -35369,7 +35393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -35388,7 +35412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -36266,7 +36290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2004),
+                            constructor: DeclarationId(2007),
                             payload: vec![],
                         },
                     ),
@@ -36303,7 +36327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2005),
+                            constructor: DeclarationId(2008),
                             payload: vec![],
                         },
                     ),
@@ -36314,7 +36338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1995),
+                                    constructor: DeclarationId(1998),
                                     payload: vec![],
                                 },
                             ),
@@ -36352,7 +36376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -36364,7 +36388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1995),
+                                        constructor: DeclarationId(1998),
                                         payload: vec![],
                                     },
                                 ),
@@ -36374,7 +36398,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1995),
+                                        constructor: DeclarationId(1998),
                                         payload: vec![],
                                     },
                                 ),
@@ -36413,7 +36437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![],
                         },
                     ),
@@ -36425,7 +36449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1995),
+                                        constructor: DeclarationId(1998),
                                         payload: vec![],
                                     },
                                 ),
@@ -36435,7 +36459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1995),
+                                        constructor: DeclarationId(1998),
                                         payload: vec![],
                                     },
                                 ),
@@ -36474,7 +36498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2008),
+                            constructor: DeclarationId(2011),
                             payload: vec![],
                         },
                     ),
@@ -36485,7 +36509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1994),
+                                    constructor: DeclarationId(1997),
                                     payload: vec![],
                                 },
                             ),
@@ -36624,7 +36648,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2009),
+                            constructor: DeclarationId(2012),
                             payload: vec![],
                         },
                     ),
@@ -36635,7 +36659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1994),
+                                    constructor: DeclarationId(1997),
                                     payload: vec![],
                                 },
                             ),
@@ -36673,7 +36697,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2010),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
@@ -36685,7 +36709,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -36695,7 +36719,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1995),
+                                        constructor: DeclarationId(1998),
                                         payload: vec![],
                                     },
                                 ),
@@ -36705,7 +36729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -36744,7 +36768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2014),
                             payload: vec![],
                         },
                     ),
@@ -36756,7 +36780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -36766,7 +36790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -36805,7 +36829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2012),
+                            constructor: DeclarationId(2015),
                             payload: vec![],
                         },
                     ),
@@ -36817,7 +36841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -36827,7 +36851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -36866,7 +36890,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2013),
+                            constructor: DeclarationId(2016),
                             payload: vec![],
                         },
                     ),
@@ -36878,7 +36902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -36888,7 +36912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -36927,7 +36951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2015),
+                            constructor: DeclarationId(2018),
                             payload: vec![],
                         },
                     ),
@@ -38355,7 +38379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1990),
+                            constructor: DeclarationId(1993),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1623),
                                 payload: vec![
@@ -38412,7 +38436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1990),
+                            constructor: DeclarationId(1993),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1624),
                                 payload: vec![],
@@ -39077,7 +39101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1991),
+                                    constructor: DeclarationId(1994),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -39175,7 +39199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -39194,7 +39218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -39215,7 +39239,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -39276,7 +39300,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -39295,7 +39319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -39356,7 +39380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -39375,7 +39399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -39394,7 +39418,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -39531,7 +39555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -39550,7 +39574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -39569,7 +39593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -39630,7 +39654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -39651,7 +39675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -39670,7 +39694,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -39689,7 +39713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -39750,7 +39774,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -39769,7 +39793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -39788,7 +39812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -39849,7 +39873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -39868,7 +39892,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -39887,7 +39911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -40558,7 +40582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2004),
+                            constructor: DeclarationId(2007),
                             payload: vec![],
                         },
                     ),
@@ -40595,7 +40619,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2005),
+                            constructor: DeclarationId(2008),
                             payload: vec![],
                         },
                     ),
@@ -40606,7 +40630,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1995),
+                                    constructor: DeclarationId(1998),
                                     payload: vec![],
                                 },
                             ),
@@ -40644,7 +40668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -40656,7 +40680,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1995),
+                                        constructor: DeclarationId(1998),
                                         payload: vec![],
                                     },
                                 ),
@@ -40666,7 +40690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1995),
+                                        constructor: DeclarationId(1998),
                                         payload: vec![],
                                     },
                                 ),
@@ -40705,7 +40729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![],
                         },
                     ),
@@ -40717,7 +40741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1995),
+                                        constructor: DeclarationId(1998),
                                         payload: vec![],
                                     },
                                 ),
@@ -40727,7 +40751,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1995),
+                                        constructor: DeclarationId(1998),
                                         payload: vec![],
                                     },
                                 ),
@@ -40766,7 +40790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2008),
+                            constructor: DeclarationId(2011),
                             payload: vec![],
                         },
                     ),
@@ -40777,7 +40801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1994),
+                                    constructor: DeclarationId(1997),
                                     payload: vec![],
                                 },
                             ),
@@ -40815,7 +40839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2009),
+                            constructor: DeclarationId(2012),
                             payload: vec![],
                         },
                     ),
@@ -40826,7 +40850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1994),
+                                    constructor: DeclarationId(1997),
                                     payload: vec![],
                                 },
                             ),
@@ -40864,7 +40888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2010),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
@@ -40876,7 +40900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -40886,7 +40910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1995),
+                                        constructor: DeclarationId(1998),
                                         payload: vec![],
                                     },
                                 ),
@@ -40896,7 +40920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -40935,7 +40959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2014),
                             payload: vec![],
                         },
                     ),
@@ -40947,7 +40971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -40957,7 +40981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -40996,7 +41020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2012),
+                            constructor: DeclarationId(2015),
                             payload: vec![],
                         },
                     ),
@@ -41008,7 +41032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -41018,7 +41042,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -41057,7 +41081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2013),
+                            constructor: DeclarationId(2016),
                             payload: vec![],
                         },
                     ),
@@ -41069,7 +41093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -41079,7 +41103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -41222,7 +41246,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2015),
+                            constructor: DeclarationId(2018),
                             payload: vec![],
                         },
                     ),
@@ -41735,7 +41759,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1990),
+                            constructor: DeclarationId(1993),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1623),
                                 payload: vec![
@@ -41792,7 +41816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1990),
+                            constructor: DeclarationId(1993),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1623),
                                 payload: vec![
@@ -41849,7 +41873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1989),
+                            constructor: DeclarationId(1992),
                             payload: vec![],
                         },
                     ),
@@ -41892,7 +41916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1989),
+                            constructor: DeclarationId(1992),
                             payload: vec![],
                         },
                     ),
@@ -41935,7 +41959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1989),
+                            constructor: DeclarationId(1992),
                             payload: vec![],
                         },
                     ),
@@ -42217,7 +42241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1991),
+                                    constructor: DeclarationId(1994),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -42315,7 +42339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1992),
+                                        constructor: DeclarationId(1995),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -42334,7 +42358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1992),
+                                        constructor: DeclarationId(1995),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state_value".to_string(),
                                         ))],
@@ -42355,7 +42379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -42416,7 +42440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -42435,7 +42459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -42454,7 +42478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -42745,7 +42769,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -42764,7 +42788,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -42827,7 +42851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -42846,7 +42870,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -42909,7 +42933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -42928,7 +42952,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -42990,7 +43014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1991),
+                                    constructor: DeclarationId(1994),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -43052,7 +43076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "0".to_string(),
                                         ))],
@@ -43071,7 +43095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "1".to_string(),
                                         ))],
@@ -43132,7 +43156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -43151,7 +43175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -43212,7 +43236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -43231,7 +43255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -43250,7 +43274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -43310,7 +43334,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1992),
+                                    constructor: DeclarationId(1995),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "index_of".to_string(),
                                     ))],
@@ -43370,7 +43394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1992),
+                                        constructor: DeclarationId(1995),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -43389,7 +43413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1992),
+                                        constructor: DeclarationId(1995),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -43449,7 +43473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1992),
+                                    constructor: DeclarationId(1995),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -43508,7 +43532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1991),
+                                    constructor: DeclarationId(1994),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -43567,7 +43591,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1991),
+                                    constructor: DeclarationId(1994),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -43627,7 +43651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -43648,7 +43672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -43861,7 +43885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -43880,7 +43904,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -43901,7 +43925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -43922,7 +43946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -43943,7 +43967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -43964,7 +43988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -43985,7 +44009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -44006,7 +44030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -44027,7 +44051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -44046,7 +44070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -44337,7 +44361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -44358,7 +44382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -44419,7 +44443,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -44440,7 +44464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1992),
+                                        constructor: DeclarationId(1995),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -44459,7 +44483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -44478,7 +44502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -44577,7 +44601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -44596,7 +44620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "data".to_string(),
                                         ))],
@@ -44617,7 +44641,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1992),
+                                        constructor: DeclarationId(1995),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -44636,7 +44660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -44657,7 +44681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1992),
+                                        constructor: DeclarationId(1995),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -44718,7 +44742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -44737,7 +44761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -44756,7 +44780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -44777,7 +44801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1992),
+                                        constructor: DeclarationId(1995),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -44796,7 +44820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -44857,7 +44881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -44876,7 +44900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -44895,7 +44919,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -44916,7 +44940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1992),
+                                        constructor: DeclarationId(1995),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -44935,7 +44959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -44956,7 +44980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1992),
+                                        constructor: DeclarationId(1995),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -45017,7 +45041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -45036,7 +45060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -45055,7 +45079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -45074,7 +45098,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -45093,7 +45117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -45114,7 +45138,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1992),
+                                        constructor: DeclarationId(1995),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -45133,7 +45157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -45194,7 +45218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -45213,7 +45237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -45234,7 +45258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1992),
+                                        constructor: DeclarationId(1995),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -45253,7 +45277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -45272,7 +45296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -45293,7 +45317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1992),
+                                        constructor: DeclarationId(1995),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -45314,7 +45338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1992),
+                                        constructor: DeclarationId(1995),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -45415,7 +45439,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1992),
+                                        constructor: DeclarationId(1995),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -45434,7 +45458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1992),
+                                        constructor: DeclarationId(1995),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -45453,7 +45477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1992),
+                                        constructor: DeclarationId(1995),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -45474,7 +45498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1992),
+                                        constructor: DeclarationId(1995),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -45536,7 +45560,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1991),
+                                    constructor: DeclarationId(1994),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -45638,7 +45662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -45657,7 +45681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -45678,7 +45702,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -45741,7 +45765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -45760,7 +45784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -45823,7 +45847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -45842,7 +45866,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -45861,7 +45885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46004,7 +46028,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -46023,7 +46047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -46042,7 +46066,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46105,7 +46129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -46126,7 +46150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -46145,7 +46169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -46164,7 +46188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46227,7 +46251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -46246,7 +46270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -46265,7 +46289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46328,7 +46352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -46347,7 +46371,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -46366,7 +46390,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1991),
+                                        constructor: DeclarationId(1994),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -47285,7 +47309,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2004),
+                            constructor: DeclarationId(2007),
                             payload: vec![],
                         },
                     ),
@@ -47322,7 +47346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2005),
+                            constructor: DeclarationId(2008),
                             payload: vec![],
                         },
                     ),
@@ -47333,7 +47357,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1995),
+                                    constructor: DeclarationId(1998),
                                     payload: vec![],
                                 },
                             ),
@@ -47371,7 +47395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -47383,7 +47407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1995),
+                                        constructor: DeclarationId(1998),
                                         payload: vec![],
                                     },
                                 ),
@@ -47393,7 +47417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1995),
+                                        constructor: DeclarationId(1998),
                                         payload: vec![],
                                     },
                                 ),
@@ -47432,7 +47456,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![],
                         },
                     ),
@@ -47444,7 +47468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1995),
+                                        constructor: DeclarationId(1998),
                                         payload: vec![],
                                     },
                                 ),
@@ -47454,7 +47478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1995),
+                                        constructor: DeclarationId(1998),
                                         payload: vec![],
                                     },
                                 ),
@@ -47493,7 +47517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2008),
+                            constructor: DeclarationId(2011),
                             payload: vec![],
                         },
                     ),
@@ -47504,7 +47528,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1994),
+                                    constructor: DeclarationId(1997),
                                     payload: vec![],
                                 },
                             ),
@@ -47678,7 +47702,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2009),
+                            constructor: DeclarationId(2012),
                             payload: vec![],
                         },
                     ),
@@ -47689,7 +47713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1994),
+                                    constructor: DeclarationId(1997),
                                     payload: vec![],
                                 },
                             ),
@@ -47727,7 +47751,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2010),
+                            constructor: DeclarationId(2013),
                             payload: vec![],
                         },
                     ),
@@ -47739,7 +47763,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -47749,7 +47773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1995),
+                                        constructor: DeclarationId(1998),
                                         payload: vec![],
                                     },
                                 ),
@@ -47759,7 +47783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -47798,7 +47822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2014),
                             payload: vec![],
                         },
                     ),
@@ -47810,7 +47834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -47820,7 +47844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -47859,7 +47883,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2012),
+                            constructor: DeclarationId(2015),
                             payload: vec![],
                         },
                     ),
@@ -47871,7 +47895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -47881,7 +47905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -47920,7 +47944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2013),
+                            constructor: DeclarationId(2016),
                             payload: vec![],
                         },
                     ),
@@ -47932,7 +47956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -47942,7 +47966,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(1997),
                                         payload: vec![],
                                     },
                                 ),
@@ -47981,7 +48005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2015),
+                            constructor: DeclarationId(2018),
                             payload: vec![],
                         },
                     ),
@@ -48422,7 +48446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{ let mut __left = {left}; __left.extend({right}); __left }"
                                     .to_string(),
@@ -48436,7 +48460,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -48476,7 +48500,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).len() as i64".to_string(),
                             ))],
@@ -48489,7 +48513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -48527,7 +48551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).is_empty()".to_string(),
                             ))],
@@ -48540,7 +48564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -48580,7 +48604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2025),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().fold({init}, {body})".to_string(),
                             ))],
@@ -48593,7 +48617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2024),
                             payload: vec![],
                         },
                     ),
@@ -48665,14 +48689,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "read".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2016),
+                            constructor: DeclarationId(2019),
                             payload: vec![],
                         },
                     ),
                     (
                         "construct".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2018),
+                            constructor: DeclarationId(2021),
                             payload: vec![],
                         },
                     ),
@@ -49323,15 +49347,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SnapshotSurface".to_string(),
-                        ty: DeclarationId(2315),
+                        ty: DeclarationId(2321),
                     },
                     Field {
                         label: "SnapshotDag".to_string(),
-                        ty: DeclarationId(2316),
+                        ty: DeclarationId(2322),
                     },
                     Field {
                         label: "SnapshotText".to_string(),
-                        ty: DeclarationId(2317),
+                        ty: DeclarationId(2323),
                     },
                 ],
             },
@@ -49547,7 +49571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2315),
+                            constructor: DeclarationId(2321),
                             payload: vec![],
                         },
                     ),
@@ -49582,7 +49606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2316),
+                            constructor: DeclarationId(2322),
                             payload: vec![],
                         },
                     ),
@@ -49617,7 +49641,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2316),
+                            constructor: DeclarationId(2322),
                             payload: vec![],
                         },
                     ),
@@ -49652,7 +49676,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2316),
+                            constructor: DeclarationId(2322),
                             payload: vec![],
                         },
                     ),
@@ -49687,7 +49711,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2316),
+                            constructor: DeclarationId(2322),
                             payload: vec![],
                         },
                     ),
@@ -49722,7 +49746,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2317),
+                            constructor: DeclarationId(2323),
                             payload: vec![],
                         },
                     ),
@@ -49872,7 +49896,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("from_symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(2318),
+                output: DeclarationId(2324),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/operators.dag",
                     156,
@@ -50288,11 +50312,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OrderedRingAlgebra".to_string(),
-                        ty: DeclarationId(2319),
+                        ty: DeclarationId(2325),
                     },
                     Field {
                         label: "SemiringAlgebra".to_string(),
-                        ty: DeclarationId(2320),
+                        ty: DeclarationId(2326),
                     },
                 ],
             },
@@ -50313,11 +50337,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BooleanAlgebraAlgebra".to_string(),
-                        ty: DeclarationId(2321),
+                        ty: DeclarationId(2327),
                     },
                     Field {
                         label: "TerminalAlgebra".to_string(),
-                        ty: DeclarationId(2322),
+                        ty: DeclarationId(2328),
                     },
                 ],
             },
@@ -50338,31 +50362,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BitCarrier".to_string(),
-                        ty: DeclarationId(2323),
+                        ty: DeclarationId(2329),
                     },
                     Field {
                         label: "ByteCarrier".to_string(),
-                        ty: DeclarationId(2324),
+                        ty: DeclarationId(2330),
                     },
                     Field {
                         label: "Word16Carrier".to_string(),
-                        ty: DeclarationId(2325),
+                        ty: DeclarationId(2331),
                     },
                     Field {
                         label: "Word32Carrier".to_string(),
-                        ty: DeclarationId(2326),
+                        ty: DeclarationId(2332),
                     },
                     Field {
                         label: "Word64Carrier".to_string(),
-                        ty: DeclarationId(2327),
+                        ty: DeclarationId(2333),
                     },
                     Field {
                         label: "Word128Carrier".to_string(),
-                        ty: DeclarationId(2328),
+                        ty: DeclarationId(2334),
                     },
                     Field {
                         label: "TerminalCarrier".to_string(),
-                        ty: DeclarationId(2329),
+                        ty: DeclarationId(2335),
                     },
                 ],
             },
@@ -50383,15 +50407,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TwoComplementWrap".to_string(),
-                        ty: DeclarationId(2330),
+                        ty: DeclarationId(2336),
                     },
                     Field {
                         label: "Saturating".to_string(),
-                        ty: DeclarationId(2331),
+                        ty: DeclarationId(2337),
                     },
                     Field {
                         label: "Trap".to_string(),
-                        ty: DeclarationId(2332),
+                        ty: DeclarationId(2338),
                     },
                 ],
             },
@@ -50412,11 +50436,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IntegerPrimitive".to_string(),
-                        ty: DeclarationId(2333),
+                        ty: DeclarationId(2339),
                     },
                     Field {
                         label: "NonIntegerPrimitive".to_string(),
-                        ty: DeclarationId(2334),
+                        ty: DeclarationId(2340),
                     },
                 ],
             },
@@ -50442,83 +50466,83 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2335)),
+            meta_tag: Some(DeclarationId(2341)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
                 FieldValue::Variant {
-                    constructor: DeclarationId(2333),
+                    constructor: DeclarationId(2339),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2319),
+                            constructor: DeclarationId(2325),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2324),
+                            constructor: DeclarationId(2330),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("-128".to_string())),
                         FieldValue::Literal(LiteralBits::String("127".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2330),
+                            constructor: DeclarationId(2336),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2333),
+                    constructor: DeclarationId(2339),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2319),
+                            constructor: DeclarationId(2325),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2325),
+                            constructor: DeclarationId(2331),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("-32768".to_string())),
                         FieldValue::Literal(LiteralBits::String("32767".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2330),
+                            constructor: DeclarationId(2336),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2333),
+                    constructor: DeclarationId(2339),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2319),
+                            constructor: DeclarationId(2325),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2326),
+                            constructor: DeclarationId(2332),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("-2147483648".to_string())),
                         FieldValue::Literal(LiteralBits::String("2147483647".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2330),
+                            constructor: DeclarationId(2336),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2333),
+                    constructor: DeclarationId(2339),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2319),
+                            constructor: DeclarationId(2325),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2327),
+                            constructor: DeclarationId(2333),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -50527,21 +50551,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2330),
+                            constructor: DeclarationId(2336),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2333),
+                    constructor: DeclarationId(2339),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2319),
+                            constructor: DeclarationId(2325),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2328),
+                            constructor: DeclarationId(2334),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -50552,84 +50576,84 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2330),
+                            constructor: DeclarationId(2336),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2333),
+                    constructor: DeclarationId(2339),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2320),
+                            constructor: DeclarationId(2326),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2324),
+                            constructor: DeclarationId(2330),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("255".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2330),
+                            constructor: DeclarationId(2336),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2333),
+                    constructor: DeclarationId(2339),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2320),
+                            constructor: DeclarationId(2326),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2325),
+                            constructor: DeclarationId(2331),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("65535".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2330),
+                            constructor: DeclarationId(2336),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2333),
+                    constructor: DeclarationId(2339),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2320),
+                            constructor: DeclarationId(2326),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2326),
+                            constructor: DeclarationId(2332),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("4294967295".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2330),
+                            constructor: DeclarationId(2336),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2333),
+                    constructor: DeclarationId(2339),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2320),
+                            constructor: DeclarationId(2326),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2327),
+                            constructor: DeclarationId(2333),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -50638,36 +50662,36 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2330),
+                            constructor: DeclarationId(2336),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2334),
+                    constructor: DeclarationId(2340),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("bool".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2321),
+                            constructor: DeclarationId(2327),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2323),
+                            constructor: DeclarationId(2329),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2334),
+                    constructor: DeclarationId(2340),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("()".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2322),
+                            constructor: DeclarationId(2328),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2329),
+                            constructor: DeclarationId(2335),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -58809,7 +58833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1073, 1085),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1073, 1086),
         });
         declarations.push(Declaration {
             id: DeclarationId(1944),
@@ -58823,7 +58847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1090, 1103),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1091, 1103),
         });
         declarations.push(Declaration {
             id: DeclarationId(1945),
@@ -58851,11 +58875,53 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1125, 1148),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1125, 1147),
         });
         declarations.push(Declaration {
             id: DeclarationId(1947),
             name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1152, 1171),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1948),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1176, 1201),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1949),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1206, 1229),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1950),
+            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -58870,10 +58936,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5348, 5384),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5429, 5465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1948),
+            id: DeclarationId(1951),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58889,10 +58955,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5389, 5430),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5470, 5511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1949),
+            id: DeclarationId(1952),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -58909,10 +58975,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5889, 5905),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5970, 5986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1950),
+            id: DeclarationId(1953),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58928,10 +58994,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9017, 9058),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9098, 9139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1951),
+            id: DeclarationId(1954),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58942,10 +59008,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9355, 9367),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9436, 9448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1952),
+            id: DeclarationId(1955),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -58962,10 +59028,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9637, 9649),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9718, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1953),
+            id: DeclarationId(1956),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58975,7 +59041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "sites".to_string(),
-                        ty: DeclarationId(1952),
+                        ty: DeclarationId(1955),
                     },
                 ],
             },
@@ -58987,10 +59053,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9594, 9651),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9675, 9732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1954),
+            id: DeclarationId(1957),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59006,10 +59072,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9961, 9995),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10042, 10076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1955),
+            id: DeclarationId(1958),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59025,10 +59091,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10398, 10449),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10479, 10530),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1956),
+            id: DeclarationId(1959),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59039,10 +59105,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10792, 10810),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10873, 10891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1957),
+            id: DeclarationId(1960),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59068,10 +59134,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 11160, 11258),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 11241, 11339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1958),
+            id: DeclarationId(1961),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -59091,7 +59157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4846, 4866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1959),
+            id: DeclarationId(1962),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(887),
@@ -59117,7 +59183,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4876, 4900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1960),
+            id: DeclarationId(1963),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(887),
@@ -59143,7 +59209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4911, 4935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1961),
+            id: DeclarationId(1964),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(887),
@@ -59169,7 +59235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4941, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1962),
+            id: DeclarationId(1965),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -59189,7 +59255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5042, 5062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1963),
+            id: DeclarationId(1966),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(887),
@@ -59215,7 +59281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5072, 5096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1964),
+            id: DeclarationId(1967),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(887),
@@ -59241,7 +59307,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5107, 5131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1965),
+            id: DeclarationId(1968),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(887),
@@ -59267,7 +59333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5137, 5161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1966),
+            id: DeclarationId(1969),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -59287,7 +59353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5245, 5265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1967),
+            id: DeclarationId(1970),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(887),
@@ -59313,7 +59379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5276, 5300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1968),
+            id: DeclarationId(1971),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(887),
@@ -59339,7 +59405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5325, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1969),
+            id: DeclarationId(1972),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -59359,7 +59425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5440, 5460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1970),
+            id: DeclarationId(1973),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(887),
@@ -59385,7 +59451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5471, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1971),
+            id: DeclarationId(1974),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(887),
@@ -59411,7 +59477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5520, 5544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1972),
+            id: DeclarationId(1975),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59430,7 +59496,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1634, 1651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1973),
+            id: DeclarationId(1976),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59455,7 +59521,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1656, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1974),
+            id: DeclarationId(1977),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59469,7 +59535,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1879, 1891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1975),
+            id: DeclarationId(1978),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59488,7 +59554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1896, 1932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1976),
+            id: DeclarationId(1979),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(880),
@@ -59508,13 +59574,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2414, 2430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1977),
+            id: DeclarationId(1980),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(608),
-                    value: DeclarationId(1976),
+                    value: DeclarationId(1979),
                 }],
             },
             type_params: vec![],
@@ -59528,7 +59594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2409, 2431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1978),
+            id: DeclarationId(1981),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59542,7 +59608,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1977),
+                        ty: DeclarationId(1980),
                     },
                 ],
             },
@@ -59557,7 +59623,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2325, 2437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1979),
+            id: DeclarationId(1982),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -59577,7 +59643,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2505, 2521),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1980),
+            id: DeclarationId(1983),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(880),
@@ -59597,13 +59663,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2544, 2560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1981),
+            id: DeclarationId(1984),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(608),
-                    value: DeclarationId(1980),
+                    value: DeclarationId(1983),
                 }],
             },
             type_params: vec![],
@@ -59617,7 +59683,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2539, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1982),
+            id: DeclarationId(1985),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59627,11 +59693,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "violations".to_string(),
-                        ty: DeclarationId(1979),
+                        ty: DeclarationId(1982),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1981),
+                        ty: DeclarationId(1984),
                     },
                 ],
             },
@@ -59646,7 +59712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2442, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1983),
+            id: DeclarationId(1986),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(880),
@@ -59666,11 +59732,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3902, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1984),
+            id: DeclarationId(1987),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(748), DeclarationId(747)],
-                output: DeclarationId(1983),
+                output: DeclarationId(1986),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -59684,7 +59750,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3881, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1985),
+            id: DeclarationId(1988),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -59704,7 +59770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3930, 3945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1986),
+            id: DeclarationId(1989),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747), DeclarationId(886)],
@@ -59722,7 +59788,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3966, 4009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1987),
+            id: DeclarationId(1990),
             name: Some("DimensionUnitAbelianGroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(25),
@@ -59742,7 +59808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1988),
+            id: DeclarationId(1991),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -59762,7 +59828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1989),
+            id: DeclarationId(1992),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59776,7 +59842,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4188, 4204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1990),
+            id: DeclarationId(1993),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59795,7 +59861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4209, 4237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1991),
+            id: DeclarationId(1994),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59814,7 +59880,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4727, 4746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1992),
+            id: DeclarationId(1995),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59833,7 +59899,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4751, 4773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1993),
+            id: DeclarationId(1996),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -59853,7 +59919,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5142, 5165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1994),
+            id: DeclarationId(1997),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59867,7 +59933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6162, 6170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1995),
+            id: DeclarationId(1998),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59881,7 +59947,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6175, 6183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1996),
+            id: DeclarationId(1999),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59895,7 +59961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1997),
+            id: DeclarationId(2000),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59909,7 +59975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6634, 6642),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1998),
+            id: DeclarationId(2001),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59923,7 +59989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6978, 6991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1999),
+            id: DeclarationId(2002),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59937,7 +60003,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6996, 7002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2000),
+            id: DeclarationId(2003),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59951,7 +60017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7260, 7268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2001),
+            id: DeclarationId(2004),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59965,7 +60031,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7273, 7278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2002),
+            id: DeclarationId(2005),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59979,7 +60045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7283, 7296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2003),
+            id: DeclarationId(2006),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59993,7 +60059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7633, 7651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2004),
+            id: DeclarationId(2007),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60007,7 +60073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9026, 9035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2005),
+            id: DeclarationId(2008),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60021,7 +60087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9040, 9053),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2006),
+            id: DeclarationId(2009),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60035,7 +60101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9058, 9066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2007),
+            id: DeclarationId(2010),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60049,7 +60115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9071, 9081),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2008),
+            id: DeclarationId(2011),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60063,7 +60129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9086, 9096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2009),
+            id: DeclarationId(2012),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60077,7 +60143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9101, 9112),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2010),
+            id: DeclarationId(2013),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60091,7 +60157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9117, 9125),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2011),
+            id: DeclarationId(2014),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60105,7 +60171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9130, 9137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2012),
+            id: DeclarationId(2015),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60119,7 +60185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9142, 9152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2013),
+            id: DeclarationId(2016),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60133,7 +60199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9157, 9169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2014),
+            id: DeclarationId(2017),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60147,7 +60213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11862, 11888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2015),
+            id: DeclarationId(2018),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60161,7 +60227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11893, 11903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2016),
+            id: DeclarationId(2019),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60175,7 +60241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16115, 16121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2017),
+            id: DeclarationId(2020),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60189,7 +60255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16126, 16137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2018),
+            id: DeclarationId(2021),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60203,7 +60269,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16457, 16468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2019),
+            id: DeclarationId(2022),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60217,7 +60283,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16473, 16484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2020),
+            id: DeclarationId(2023),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60231,7 +60297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 18417, 18428),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2021),
+            id: DeclarationId(2024),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60245,7 +60311,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 18433, 18441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2022),
+            id: DeclarationId(2025),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60264,7 +60330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19604, 19639),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2023),
+            id: DeclarationId(2026),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60289,7 +60355,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19644, 19732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2024),
+            id: DeclarationId(2027),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60309,7 +60375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 4881, 4909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2025),
+            id: DeclarationId(2028),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(848),
@@ -60326,7 +60392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 20505, 20517),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2026),
+            id: DeclarationId(2029),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(851),
@@ -60343,7 +60409,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 21890, 21905),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2027),
+            id: DeclarationId(2030),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60363,7 +60429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27797, 27812),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2028),
+            id: DeclarationId(2031),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -60380,7 +60446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 31950, 31954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2029),
+            id: DeclarationId(2032),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -60397,7 +60463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 32246, 32250),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2030),
+            id: DeclarationId(2033),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -60414,7 +60480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33495, 33499),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2031),
+            id: DeclarationId(2034),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -60431,7 +60497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33970, 33974),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2032),
+            id: DeclarationId(2035),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -60448,7 +60514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35233, 35237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2033),
+            id: DeclarationId(2036),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -60465,7 +60531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35505, 35509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2034),
+            id: DeclarationId(2037),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60479,7 +60545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5562, 5577),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2035),
+            id: DeclarationId(2038),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60493,7 +60559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5617, 5630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2036),
+            id: DeclarationId(2039),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60507,7 +60573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5678, 5695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2037),
+            id: DeclarationId(2040),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60521,7 +60587,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5734, 5746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2038),
+            id: DeclarationId(2041),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60535,7 +60601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5794, 5811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2039),
+            id: DeclarationId(2042),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60560,7 +60626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 9904, 9966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2040),
+            id: DeclarationId(2043),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60579,7 +60645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10013),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2041),
+            id: DeclarationId(2044),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60604,7 +60670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10018, 10075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2042),
+            id: DeclarationId(2045),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60618,7 +60684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10080, 10094),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2043),
+            id: DeclarationId(2046),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60632,7 +60698,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10099, 10114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2044),
+            id: DeclarationId(2047),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60646,7 +60712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24082, 24096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2045),
+            id: DeclarationId(2048),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60665,7 +60731,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24101, 24148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2046),
+            id: DeclarationId(2049),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60690,7 +60756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24153, 24230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2047),
+            id: DeclarationId(2050),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60715,7 +60781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24235, 24309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2048),
+            id: DeclarationId(2051),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60740,7 +60806,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24929, 24985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2049),
+            id: DeclarationId(2052),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60759,7 +60825,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 25001, 25026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2050),
+            id: DeclarationId(2053),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60773,7 +60839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26675, 26688),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2051),
+            id: DeclarationId(2054),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60792,7 +60858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26732, 26764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2052),
+            id: DeclarationId(2055),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60812,12 +60878,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26827, 26843),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2053),
+            id: DeclarationId(2056),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "factors".to_string(),
-                    ty: DeclarationId(2052),
+                    ty: DeclarationId(2055),
                 }],
             },
             type_params: vec![],
@@ -60831,7 +60897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26803, 26845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2054),
+            id: DeclarationId(2057),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60851,13 +60917,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26907, 26923),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2055),
+            id: DeclarationId(2058),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(608),
-                    value: DeclarationId(2054),
+                    value: DeclarationId(2057),
                 }],
             },
             type_params: vec![],
@@ -60871,12 +60937,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26902, 26924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2056),
+            id: DeclarationId(2059),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2055),
+                    ty: DeclarationId(2058),
                 }],
             },
             type_params: vec![],
@@ -60890,7 +60956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26874, 26926),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2057),
+            id: DeclarationId(2060),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60910,12 +60976,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27224, 27239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2058),
+            id: DeclarationId(2061),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2057),
+                    ty: DeclarationId(2060),
                 }],
             },
             type_params: vec![],
@@ -60929,7 +60995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27206, 27241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2059),
+            id: DeclarationId(2062),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60943,7 +61009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27324, 27336),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2060),
+            id: DeclarationId(2063),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60957,7 +61023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27406, 27416),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2061),
+            id: DeclarationId(2064),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60977,7 +61043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1234, 1254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2062),
+            id: DeclarationId(2065),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60997,7 +61063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1414, 1434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2063),
+            id: DeclarationId(2066),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(880),
@@ -61017,11 +61083,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2064),
+            id: DeclarationId(2067),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(748), DeclarationId(747)],
-                output: DeclarationId(2063),
+                output: DeclarationId(2066),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -61035,7 +61101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2065),
+            id: DeclarationId(2068),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -61055,7 +61121,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2066),
+            id: DeclarationId(2069),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1012), DeclarationId(1012)],
@@ -61073,7 +61139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2067),
+            id: DeclarationId(2070),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1012), DeclarationId(738)],
@@ -61091,7 +61157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2068),
+            id: DeclarationId(2071),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(748), DeclarationId(1012)],
@@ -61109,7 +61175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2069),
+            id: DeclarationId(2072),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1013),
@@ -61129,7 +61195,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4577, 4588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2070),
+            id: DeclarationId(2073),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1013),
@@ -61149,7 +61215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4630, 4641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2071),
+            id: DeclarationId(2074),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61163,7 +61229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4532, 4536),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2072),
+            id: DeclarationId(2075),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61182,7 +61248,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4541, 4551),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2073),
+            id: DeclarationId(2076),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61202,7 +61268,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1179, 1196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2074),
+            id: DeclarationId(2077),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1030),
@@ -61219,7 +61285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2075),
+            id: DeclarationId(2078),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61239,12 +61305,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1747, 1764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2076),
+            id: DeclarationId(2079),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2075),
+                    ty: DeclarationId(2078),
                 }],
             },
             type_params: vec![],
@@ -61258,7 +61324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1736, 1765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2077),
+            id: DeclarationId(2080),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61278,12 +61344,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1777, 1795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2078),
+            id: DeclarationId(2081),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2077),
+                    ty: DeclarationId(2080),
                 }],
             },
             type_params: vec![],
@@ -61297,7 +61363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1770, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2079),
+            id: DeclarationId(2082),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61322,7 +61388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2073, 2113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2080),
+            id: DeclarationId(2083),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61342,7 +61408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2165, 2182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2081),
+            id: DeclarationId(2084),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61352,7 +61418,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2080),
+                        ty: DeclarationId(2083),
                     },
                     Field {
                         label: "span".to_string(),
@@ -61371,7 +61437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2118, 2211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2082),
+            id: DeclarationId(2085),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61396,7 +61462,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2216, 2280),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2083),
+            id: DeclarationId(2086),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61416,13 +61482,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2307, 2324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2084),
+            id: DeclarationId(2087),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2083),
+                        ty: DeclarationId(2086),
                     },
                     Field {
                         label: "output".to_string(),
@@ -61445,7 +61511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2285, 2379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2085),
+            id: DeclarationId(2088),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61470,7 +61536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3749, 3795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2086),
+            id: DeclarationId(2089),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61499,7 +61565,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3800, 3883),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2087),
+            id: DeclarationId(2090),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61519,7 +61585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3937, 3962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2088),
+            id: DeclarationId(2091),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61529,7 +61595,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2087),
+                        ty: DeclarationId(2090),
                     },
                     Field {
                         label: "span".to_string(),
@@ -61548,7 +61614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3888, 3991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2089),
+            id: DeclarationId(2092),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61567,7 +61633,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4578, 4586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2090),
+            id: DeclarationId(2093),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61586,7 +61652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4591, 4601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2091),
+            id: DeclarationId(2094),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61605,7 +61671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4606, 4620),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2092),
+            id: DeclarationId(2095),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61630,7 +61696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4734, 4785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2093),
+            id: DeclarationId(2096),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61655,7 +61721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4790, 4828),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2094),
+            id: DeclarationId(2097),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61675,7 +61741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4856, 4868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2095),
+            id: DeclarationId(2098),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61695,17 +61761,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4890, 4906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2096),
+            id: DeclarationId(2099),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "segments".to_string(),
-                        ty: DeclarationId(2094),
+                        ty: DeclarationId(2097),
                     },
                     Field {
                         label: "segment_spans".to_string(),
-                        ty: DeclarationId(2095),
+                        ty: DeclarationId(2098),
                     },
                     Field {
                         label: "span".to_string(),
@@ -61724,7 +61790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4833, 4935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2097),
+            id: DeclarationId(2100),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61744,7 +61810,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4980, 4997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2098),
+            id: DeclarationId(2101),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61754,7 +61820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2097),
+                        ty: DeclarationId(2100),
                     },
                     Field {
                         label: "span".to_string(),
@@ -61773,7 +61839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4940, 5026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2099),
+            id: DeclarationId(2102),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61793,7 +61859,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5082, 5106),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2100),
+            id: DeclarationId(2103),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61803,7 +61869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2099),
+                        ty: DeclarationId(2102),
                     },
                     Field {
                         label: "span".to_string(),
@@ -61822,7 +61888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5031, 5135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2101),
+            id: DeclarationId(2104),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61842,7 +61908,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5186, 5203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2102),
+            id: DeclarationId(2105),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61852,7 +61918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2101),
+                        ty: DeclarationId(2104),
                     },
                     Field {
                         label: "span".to_string(),
@@ -61871,7 +61937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5140, 5232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2103),
+            id: DeclarationId(2106),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61891,13 +61957,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5260, 5272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2104),
+            id: DeclarationId(2107),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2103),
+                        ty: DeclarationId(2106),
                     },
                     Field {
                         label: "body".to_string(),
@@ -61920,7 +61986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5237, 5325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2105),
+            id: DeclarationId(2108),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61953,7 +62019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5330, 5449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2106),
+            id: DeclarationId(2109),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61973,7 +62039,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5503, 5524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2107),
+            id: DeclarationId(2110),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61983,7 +62049,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "arms".to_string(),
-                        ty: DeclarationId(2106),
+                        ty: DeclarationId(2109),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62002,7 +62068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5454, 5553),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2108),
+            id: DeclarationId(2111),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62022,13 +62088,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5581, 5605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2109),
+            id: DeclarationId(2112),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2108),
+                        ty: DeclarationId(2111),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62047,7 +62113,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5558, 5634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2110),
+            id: DeclarationId(2113),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62067,13 +62133,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5662, 5679),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2111),
+            id: DeclarationId(2114),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "elements".to_string(),
-                        ty: DeclarationId(2110),
+                        ty: DeclarationId(2113),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62092,7 +62158,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5639, 5708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2112),
+            id: DeclarationId(2115),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62112,13 +62178,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 7802, 7823),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2113),
+            id: DeclarationId(2116),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "entries".to_string(),
-                        ty: DeclarationId(2112),
+                        ty: DeclarationId(2115),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62137,7 +62203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 7781, 7852),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2114),
+            id: DeclarationId(2117),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1023),
@@ -62154,7 +62220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8783, 8795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2115),
+            id: DeclarationId(2118),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62164,7 +62230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_ann".to_string(),
-                        ty: DeclarationId(2114),
+                        ty: DeclarationId(2117),
                     },
                     Field {
                         label: "expr".to_string(),
@@ -62183,7 +62249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8742, 8825),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2116),
+            id: DeclarationId(2119),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62203,7 +62269,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8873, 8885),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2117),
+            id: DeclarationId(2120),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62223,7 +62289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8900, 8918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2118),
+            id: DeclarationId(2121),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62233,11 +62299,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2116),
+                        ty: DeclarationId(2119),
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2117),
+                        ty: DeclarationId(2120),
                     },
                     Field {
                         label: "return_type".to_string(),
@@ -62264,7 +62330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8830, 9002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2119),
+            id: DeclarationId(2122),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62284,7 +62350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9062, 9074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2120),
+            id: DeclarationId(2123),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62304,7 +62370,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9089, 9107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2121),
+            id: DeclarationId(2124),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62314,11 +62380,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2119),
+                        ty: DeclarationId(2122),
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2120),
+                        ty: DeclarationId(2123),
                     },
                     Field {
                         label: "return_type".to_string(),
@@ -62345,7 +62411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9007, 9195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2122),
+            id: DeclarationId(2125),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1030),
@@ -62362,7 +62428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9260, 9272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2123),
+            id: DeclarationId(2126),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62376,7 +62442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(2122),
+                        ty: DeclarationId(2125),
                     },
                     Field {
                         label: "body_span".to_string(),
@@ -62399,7 +62465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9200, 9329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2124),
+            id: DeclarationId(2127),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62419,13 +62485,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9349, 9361),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2125),
+            id: DeclarationId(2128),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2124),
+                        ty: DeclarationId(2127),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62444,7 +62510,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9334, 9381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2126),
+            id: DeclarationId(2129),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62464,7 +62530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9407, 9419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2127),
+            id: DeclarationId(2130),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62484,17 +62550,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9433, 9445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2128),
+            id: DeclarationId(2131),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2126),
+                        ty: DeclarationId(2129),
                     },
                     Field {
                         label: "names".to_string(),
-                        ty: DeclarationId(2127),
+                        ty: DeclarationId(2130),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62513,7 +62579,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9386, 9474),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2129),
+            id: DeclarationId(2132),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62533,7 +62599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9528, 9540),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2130),
+            id: DeclarationId(2133),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62543,7 +62609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2129),
+                        ty: DeclarationId(2132),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62562,7 +62628,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9479, 9569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2131),
+            id: DeclarationId(2134),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62582,7 +62648,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9625, 9637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2132),
+            id: DeclarationId(2135),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62602,7 +62668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9652, 9670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2133),
+            id: DeclarationId(2136),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62612,11 +62678,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2131),
+                        ty: DeclarationId(2134),
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2132),
+                        ty: DeclarationId(2135),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62635,7 +62701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9574, 9699),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2134),
+            id: DeclarationId(2137),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62655,7 +62721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9752, 9764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2135),
+            id: DeclarationId(2138),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62675,7 +62741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9781, 9801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2136),
+            id: DeclarationId(2139),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1023),
@@ -62692,7 +62758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9818, 9830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2137),
+            id: DeclarationId(2140),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62702,15 +62768,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2134),
+                        ty: DeclarationId(2137),
                     },
                     Field {
                         label: "variants".to_string(),
-                        ty: DeclarationId(2135),
+                        ty: DeclarationId(2138),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(2136),
+                        ty: DeclarationId(2139),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62729,7 +62795,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9704, 9859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2138),
+            id: DeclarationId(2141),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62749,7 +62815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9914, 9926),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2139),
+            id: DeclarationId(2142),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1030),
@@ -62766,7 +62832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9998, 10010),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2140),
+            id: DeclarationId(2143),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62776,7 +62842,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2138),
+                        ty: DeclarationId(2141),
                     },
                     Field {
                         label: "nominal_opaque".to_string(),
@@ -62788,7 +62854,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "refinement".to_string(),
-                        ty: DeclarationId(2139),
+                        ty: DeclarationId(2142),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62807,7 +62873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9864, 10039),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2141),
+            id: DeclarationId(2144),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62831,7 +62897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2142),
+            id: DeclarationId(2145),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62850,7 +62916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2132, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2143),
+            id: DeclarationId(2146),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62870,12 +62936,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2174, 2190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2144),
+            id: DeclarationId(2147),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2143),
+                    ty: DeclarationId(2146),
                 }],
             },
             type_params: vec![],
@@ -62889,7 +62955,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2162, 2191),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2145),
+            id: DeclarationId(2148),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62914,7 +62980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2196, 2247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2146),
+            id: DeclarationId(2149),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62933,7 +62999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2252, 2267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2147),
+            id: DeclarationId(2150),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62952,7 +63018,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2272, 2299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2148),
+            id: DeclarationId(2151),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -62978,7 +63044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 3931, 3949),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2149),
+            id: DeclarationId(2152),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62998,7 +63064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 4537, 4552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2150),
+            id: DeclarationId(2153),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63017,7 +63083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5405, 5459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2151),
+            id: DeclarationId(2154),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63031,7 +63097,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5724, 5733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2152),
+            id: DeclarationId(2155),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -63051,7 +63117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3589, 3617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2153),
+            id: DeclarationId(2156),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -63077,7 +63143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/services.dag", 6838, 6861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2154),
+            id: DeclarationId(2157),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1054),
@@ -63094,7 +63160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2329, 2345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2155),
+            id: DeclarationId(2158),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1054),
@@ -63111,7 +63177,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2350, 2366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2156),
+            id: DeclarationId(2159),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1054),
@@ -63128,7 +63194,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2371, 2387),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2157),
+            id: DeclarationId(2160),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -63154,7 +63220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2632, 2660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2158),
+            id: DeclarationId(2161),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -63180,7 +63246,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2704, 2732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2159),
+            id: DeclarationId(2162),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1062),
@@ -63197,7 +63263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5879, 5901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2160),
+            id: DeclarationId(2163),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1063),
@@ -63214,7 +63280,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6321, 6341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2161),
+            id: DeclarationId(2164),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63228,7 +63294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 667, 673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2162),
+            id: DeclarationId(2165),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63242,7 +63308,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 678, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2163),
+            id: DeclarationId(2166),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63256,7 +63322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 696, 710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2164),
+            id: DeclarationId(2167),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63275,7 +63341,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3232, 3258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2165),
+            id: DeclarationId(2168),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63294,7 +63360,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3263, 3291),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2166),
+            id: DeclarationId(2169),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63313,7 +63379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3296, 3329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2167),
+            id: DeclarationId(2170),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63332,7 +63398,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3334, 3365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2168),
+            id: DeclarationId(2171),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63351,7 +63417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3370, 3402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2169),
+            id: DeclarationId(2172),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63365,7 +63431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4409, 4416),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2170),
+            id: DeclarationId(2173),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63384,7 +63450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4421, 4471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2171),
+            id: DeclarationId(2174),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63398,7 +63464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4966, 4977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2172),
+            id: DeclarationId(2175),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63417,7 +63483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4982, 5027),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2173),
+            id: DeclarationId(2176),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63436,7 +63502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7131, 7165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2174),
+            id: DeclarationId(2177),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63455,7 +63521,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7170, 7214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2175),
+            id: DeclarationId(2178),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63474,7 +63540,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7219, 7277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2176),
+            id: DeclarationId(2179),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63493,7 +63559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7282, 7338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2177),
+            id: DeclarationId(2180),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63512,7 +63578,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7343, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2178),
+            id: DeclarationId(2181),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63531,7 +63597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7381, 7411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2179),
+            id: DeclarationId(2182),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63545,7 +63611,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7416, 7429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2180),
+            id: DeclarationId(2183),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -63565,7 +63631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7469, 7491),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2181),
+            id: DeclarationId(2184),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -63585,7 +63651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7701, 7722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2182),
+            id: DeclarationId(2185),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63599,7 +63665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2183),
+            id: DeclarationId(2186),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63613,7 +63679,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2184),
+            id: DeclarationId(2187),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63627,7 +63693,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2185),
+            id: DeclarationId(2188),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63641,7 +63707,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2186),
+            id: DeclarationId(2189),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63655,7 +63721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2187),
+            id: DeclarationId(2190),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63669,7 +63735,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2188),
+            id: DeclarationId(2191),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63683,7 +63749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2189),
+            id: DeclarationId(2192),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63697,7 +63763,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2190),
+            id: DeclarationId(2193),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63711,7 +63777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2191),
+            id: DeclarationId(2194),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63725,7 +63791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2192),
+            id: DeclarationId(2195),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63739,7 +63805,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2193),
+            id: DeclarationId(2196),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63753,7 +63819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 768, 774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2194),
+            id: DeclarationId(2197),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63767,7 +63833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 779, 786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2195),
+            id: DeclarationId(2198),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63786,7 +63852,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 791, 804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2196),
+            id: DeclarationId(2199),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63805,7 +63871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 809, 820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2197),
+            id: DeclarationId(2200),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63824,7 +63890,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 825, 842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2198),
+            id: DeclarationId(2201),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63838,7 +63904,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 847, 849),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2199),
+            id: DeclarationId(2202),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63852,7 +63918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 854, 858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2200),
+            id: DeclarationId(2203),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63866,7 +63932,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 863, 868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2201),
+            id: DeclarationId(2204),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63880,7 +63946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 873, 875),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2202),
+            id: DeclarationId(2205),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63894,7 +63960,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 880, 882),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2203),
+            id: DeclarationId(2206),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63908,7 +63974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 887, 889),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2204),
+            id: DeclarationId(2207),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63922,7 +63988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 894, 896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2205),
+            id: DeclarationId(2208),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63936,7 +64002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 901, 905),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2206),
+            id: DeclarationId(2209),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63950,7 +64016,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 910, 915),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2207),
+            id: DeclarationId(2210),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63964,7 +64030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 920, 924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2208),
+            id: DeclarationId(2211),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63978,7 +64044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 929, 934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2209),
+            id: DeclarationId(2212),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63992,7 +64058,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 939, 945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2210),
+            id: DeclarationId(2213),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64006,7 +64072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 950, 958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2211),
+            id: DeclarationId(2214),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64020,7 +64086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 963, 968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2212),
+            id: DeclarationId(2215),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64034,7 +64100,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 973, 978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2213),
+            id: DeclarationId(2216),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64048,7 +64114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 983, 991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2214),
+            id: DeclarationId(2217),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64062,7 +64128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 996, 1005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2215),
+            id: DeclarationId(2218),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64076,7 +64142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1010, 1013),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2216),
+            id: DeclarationId(2219),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64090,7 +64156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1018, 1024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2217),
+            id: DeclarationId(2220),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64104,7 +64170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1029, 1035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2218),
+            id: DeclarationId(2221),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64118,7 +64184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1040, 1046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2219),
+            id: DeclarationId(2222),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64132,7 +64198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1051, 1057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2220),
+            id: DeclarationId(2223),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64146,7 +64212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1062, 1070),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2221),
+            id: DeclarationId(2224),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64160,7 +64226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1075, 1083),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2222),
+            id: DeclarationId(2225),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64174,7 +64240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1088, 1093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2223),
+            id: DeclarationId(2226),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64188,7 +64254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1098, 1107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2224),
+            id: DeclarationId(2227),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64202,7 +64268,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1116),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2225),
+            id: DeclarationId(2228),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64216,7 +64282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1121, 1129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2226),
+            id: DeclarationId(2229),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64230,7 +64296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1134, 1137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2227),
+            id: DeclarationId(2230),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64244,7 +64310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1708, 1713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2228),
+            id: DeclarationId(2231),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64258,7 +64324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1718, 1722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2229),
+            id: DeclarationId(2232),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64272,7 +64338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1727, 1733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2230),
+            id: DeclarationId(2233),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64286,7 +64352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1738, 1744),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2231),
+            id: DeclarationId(2234),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64300,7 +64366,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1749, 1753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2232),
+            id: DeclarationId(2235),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64314,7 +64380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1758, 1764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2233),
+            id: DeclarationId(2236),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64328,7 +64394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1769, 1777),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2234),
+            id: DeclarationId(2237),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64342,7 +64408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1782, 1790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2235),
+            id: DeclarationId(2238),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64356,7 +64422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1795, 1802),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2236),
+            id: DeclarationId(2239),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64370,7 +64436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1807, 1813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2237),
+            id: DeclarationId(2240),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64384,7 +64450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1818, 1825),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2238),
+            id: DeclarationId(2241),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64398,7 +64464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1830, 1836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2239),
+            id: DeclarationId(2242),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64412,7 +64478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1841, 1848),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2240),
+            id: DeclarationId(2243),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64426,7 +64492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2288, 2290),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2241),
+            id: DeclarationId(2244),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64440,7 +64506,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2295, 2299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2242),
+            id: DeclarationId(2245),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64454,7 +64520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2304, 2309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2243),
+            id: DeclarationId(2246),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64468,7 +64534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2314, 2316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2244),
+            id: DeclarationId(2247),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64482,7 +64548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2321, 2323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2245),
+            id: DeclarationId(2248),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64496,7 +64562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2328, 2330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2246),
+            id: DeclarationId(2249),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64510,7 +64576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2335, 2337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2247),
+            id: DeclarationId(2250),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64524,7 +64590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2342, 2346),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2248),
+            id: DeclarationId(2251),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64538,7 +64604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2351, 2356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2249),
+            id: DeclarationId(2252),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64552,7 +64618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2361, 2365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2250),
+            id: DeclarationId(2253),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64566,7 +64632,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2370, 2375),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2251),
+            id: DeclarationId(2254),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64580,7 +64646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2380, 2386),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2252),
+            id: DeclarationId(2255),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64594,7 +64660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2391, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2253),
+            id: DeclarationId(2256),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64608,7 +64674,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2404, 2409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2254),
+            id: DeclarationId(2257),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64622,7 +64688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2414, 2419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2255),
+            id: DeclarationId(2258),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64636,7 +64702,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2424, 2432),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2256),
+            id: DeclarationId(2259),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64650,7 +64716,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2437, 2446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2257),
+            id: DeclarationId(2260),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64664,7 +64730,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2451, 2454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2258),
+            id: DeclarationId(2261),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64678,7 +64744,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2459, 2465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2259),
+            id: DeclarationId(2262),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64692,7 +64758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2470, 2476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2260),
+            id: DeclarationId(2263),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64706,7 +64772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2481, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2261),
+            id: DeclarationId(2264),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64720,7 +64786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2492, 2498),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2262),
+            id: DeclarationId(2265),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64734,7 +64800,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2503, 2511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2263),
+            id: DeclarationId(2266),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64748,7 +64814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2516, 2524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2264),
+            id: DeclarationId(2267),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64762,7 +64828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2529, 2534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2265),
+            id: DeclarationId(2268),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64776,7 +64842,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2539, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2266),
+            id: DeclarationId(2269),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64790,7 +64856,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2553, 2557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2267),
+            id: DeclarationId(2270),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64804,7 +64870,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2562, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2268),
+            id: DeclarationId(2271),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -64821,10 +64887,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16747, 16770),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16828, 16851),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2269),
+            id: DeclarationId(2272),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -64841,10 +64907,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16972, 16987),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17053, 17068),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2270),
+            id: DeclarationId(2273),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -64861,10 +64927,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16992, 17012),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17073, 17093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2271),
+            id: DeclarationId(2274),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64878,7 +64944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2480, 2494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2272),
+            id: DeclarationId(2275),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64892,7 +64958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2499, 2509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2273),
+            id: DeclarationId(2276),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64906,7 +64972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2514, 2526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2274),
+            id: DeclarationId(2277),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64917,10 +64983,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2531, 2543),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2531, 2544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2275),
+            id: DeclarationId(2278),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64931,10 +64997,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2548, 2561),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2549, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2276),
+            id: DeclarationId(2279),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64948,7 +65014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2566, 2578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2277),
+            id: DeclarationId(2280),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64959,10 +65025,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2583, 2606),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2583, 2605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2278),
+            id: DeclarationId(2281),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64973,10 +65039,52 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3012, 3021),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2610, 2629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2279),
+            id: DeclarationId(2282),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/verification.dag", 2634, 2659),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2283),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/verification.dag", 2664, 2687),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2284),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/verification.dag", 3093, 3102),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2285),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64992,10 +65100,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3026, 3042),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3107, 3123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2280),
+            id: DeclarationId(2286),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65006,10 +65114,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3701, 3709),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3782, 3790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2281),
+            id: DeclarationId(2287),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65020,10 +65128,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3714, 3724),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3795, 3805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2282),
+            id: DeclarationId(2288),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65034,10 +65142,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4539, 4552),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4620, 4633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2283),
+            id: DeclarationId(2289),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65048,10 +65156,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4557, 4570),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4638, 4651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2284),
+            id: DeclarationId(2290),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65062,10 +65170,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4575, 4583),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4656, 4664),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2285),
+            id: DeclarationId(2291),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65076,10 +65184,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4608, 4616),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4689, 4697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2286),
+            id: DeclarationId(2292),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65095,10 +65203,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4621, 4661),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4702, 4742),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2287),
+            id: DeclarationId(2293),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65114,10 +65222,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4666, 4699),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4747, 4780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2288),
+            id: DeclarationId(2294),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65139,10 +65247,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4704, 4782),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4785, 4863),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2289),
+            id: DeclarationId(2295),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65158,10 +65266,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4948, 5011),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5029, 5092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2290),
+            id: DeclarationId(2296),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65187,10 +65295,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5016, 5107),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5097, 5188),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2291),
+            id: DeclarationId(2297),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65216,10 +65324,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5112, 5244),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5193, 5325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2292),
+            id: DeclarationId(2298),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65241,10 +65349,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5459, 5548),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5540, 5629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2293),
+            id: DeclarationId(2299),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -65261,10 +65369,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6348, 6360),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6429, 6441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2294),
+            id: DeclarationId(2300),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65274,7 +65382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2293),
+                        ty: DeclarationId(2299),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -65290,10 +65398,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6297, 6394),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6378, 6475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2295),
+            id: DeclarationId(2301),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -65310,10 +65418,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 7094, 7106),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7175, 7187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2296),
+            id: DeclarationId(2302),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65323,7 +65431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2295),
+                        ty: DeclarationId(2301),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -65339,10 +65447,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 7044, 7140),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7125, 7221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2297),
+            id: DeclarationId(2303),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65368,10 +65476,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 7438, 7560),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7519, 7641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2298),
+            id: DeclarationId(2304),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65397,10 +65505,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 7822, 7947),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7903, 8028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2299),
+            id: DeclarationId(2305),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65416,10 +65524,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10000, 10061),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10081, 10142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2300),
+            id: DeclarationId(2306),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65441,10 +65549,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10628, 10740),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10709, 10821),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2301),
+            id: DeclarationId(2307),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65466,10 +65574,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11336, 11415),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11417, 11496),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2302),
+            id: DeclarationId(2308),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65495,10 +65603,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11635, 11748),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11716, 11829),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2303),
+            id: DeclarationId(2309),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65524,10 +65632,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11753, 11889),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11834, 11970),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2304),
+            id: DeclarationId(2310),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65549,10 +65657,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11894, 11976),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11975, 12057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2305),
+            id: DeclarationId(2311),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65574,10 +65682,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11981, 12067),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12062, 12148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2306),
+            id: DeclarationId(2312),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -65594,10 +65702,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12146, 12156),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12227, 12237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2307),
+            id: DeclarationId(2313),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65607,7 +65715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "generated_paths".to_string(),
-                        ty: DeclarationId(2306),
+                        ty: DeclarationId(2312),
                     },
                 ],
             },
@@ -65619,10 +65727,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12072, 12162),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12153, 12243),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2308),
+            id: DeclarationId(2314),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65648,10 +65756,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 13104, 13238),
+            span: SourceSpan::new("src/v3/std/verification.dag", 13185, 13319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2309),
+            id: DeclarationId(2315),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65677,10 +65785,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 13877, 14021),
+            span: SourceSpan::new("src/v3/std/verification.dag", 13958, 14102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2310),
+            id: DeclarationId(2316),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65696,10 +65804,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 14866, 14920),
+            span: SourceSpan::new("src/v3/std/verification.dag", 14947, 15001),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2311),
+            id: DeclarationId(2317),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -65716,10 +65824,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15964, 15987),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16045, 16068),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2312),
+            id: DeclarationId(2318),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -65736,10 +65844,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16033, 16048),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16114, 16129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2313),
+            id: DeclarationId(2319),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -65756,10 +65864,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16304, 16327),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16385, 16408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2314),
+            id: DeclarationId(2320),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -65779,7 +65887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2315),
+            id: DeclarationId(2321),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65793,7 +65901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 532, 547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2316),
+            id: DeclarationId(2322),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65807,7 +65915,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 550, 561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2317),
+            id: DeclarationId(2323),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65821,7 +65929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2318),
+            id: DeclarationId(2324),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(726),
@@ -65838,7 +65946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2319),
+            id: DeclarationId(2325),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65852,7 +65960,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5552, 5570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2320),
+            id: DeclarationId(2326),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65866,7 +65974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5575, 5590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2321),
+            id: DeclarationId(2327),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65880,7 +65988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5619, 5640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2322),
+            id: DeclarationId(2328),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65894,7 +66002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5645, 5660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2323),
+            id: DeclarationId(2329),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65908,7 +66016,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7257, 7267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2324),
+            id: DeclarationId(2330),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65922,7 +66030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7272, 7283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2325),
+            id: DeclarationId(2331),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65936,7 +66044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7288, 7301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2326),
+            id: DeclarationId(2332),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65950,7 +66058,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7306, 7319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2327),
+            id: DeclarationId(2333),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65964,7 +66072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7324, 7337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2328),
+            id: DeclarationId(2334),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65978,7 +66086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7342, 7356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2329),
+            id: DeclarationId(2335),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65992,7 +66100,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7361, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2330),
+            id: DeclarationId(2336),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66006,7 +66114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8118, 8135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2331),
+            id: DeclarationId(2337),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66020,7 +66128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8140, 8150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2332),
+            id: DeclarationId(2338),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66034,7 +66142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8155, 8159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2333),
+            id: DeclarationId(2339),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -66079,7 +66187,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8937, 9509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2334),
+            id: DeclarationId(2340),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -66112,7 +66220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9514, 9696),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2335),
+            id: DeclarationId(2341),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -69174,7 +69282,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(379),
             Port {
                 id: PortId(379),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2314))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2320))),
                 produced_by: Some(NodeId(279)),
             },
         );
diff --git a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
index 16b14728555..4f596446beb 100644
--- a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
+++ b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
@@ -8,7 +8,7 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag {
         ports: bootstrapped_fixture_without_parse_surface_dag_ports(),
         diagnostics: bootstrapped_fixture_without_parse_surface_dag_diagnostics(),
         next_node_id: 315,
-        next_declaration_id: 2253,
+        next_declaration_id: 2259,
         next_port_id: 420,
         primitives: PrimitiveCache::default(),
         substrate_markers: SubstrateMarkers::default(),
@@ -24,7 +24,7 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag {
         emit_model_variants: EmitModelVariants::default(),
         clusters: bootstrapped_fixture_without_parse_surface_dag_clusters(),
         optional_match_disjs: bootstrapped_fixture_without_parse_surface_dag_optional_match_disjs(),
-        declaration_append_begin_after_bootstrap: 2253,
+        declaration_append_begin_after_bootstrap: 2259,
     }
 }
 
@@ -4127,7 +4127,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
 #[allow(clippy::vec_init_then_push)]
 fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declaration> {
     {
-        let mut declarations = Vec::with_capacity(2253);
+        let mut declarations = Vec::with_capacity(2259);
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -23405,21 +23405,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         ty: DeclarationId(1927),
                     },
                     Field {
-                        label: "UnitMismatch".to_string(),
+                        label: "ArityMismatch".to_string(),
                         ty: DeclarationId(1928),
                     },
                     Field {
-                        label: "ArityMismatch".to_string(),
+                        label: "ResolveError".to_string(),
                         ty: DeclarationId(1929),
                     },
                     Field {
-                        label: "ResolveError".to_string(),
+                        label: "UnitMismatch".to_string(),
                         ty: DeclarationId(1930),
                     },
                     Field {
-                        label: "NominalOpacityViolation".to_string(),
+                        label: "BranchConditionNotBool".to_string(),
                         ty: DeclarationId(1931),
                     },
+                    Field {
+                        label: "MagnitudeOutOfRange".to_string(),
+                        ty: DeclarationId(1932),
+                    },
+                    Field {
+                        label: "MalformedIntegerRangeFact".to_string(),
+                        ty: DeclarationId(1933),
+                    },
+                    Field {
+                        label: "NominalOpacityViolation".to_string(),
+                        ty: DeclarationId(1934),
+                    },
                 ],
             },
             type_params: vec![],
@@ -23430,7 +23442,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 990, 1148),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 990, 1229),
         });
         declarations.push(Declaration {
             id: DeclarationId(874),
@@ -23459,7 +23471,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1354, 1607),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1435, 1688),
         });
         declarations.push(Declaration {
             id: DeclarationId(875),
@@ -23484,7 +23496,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 2387, 2450),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 2468, 2531),
         });
         declarations.push(Declaration {
             id: DeclarationId(876),
@@ -23503,7 +23515,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 4652, 4712),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 4733, 4793),
         });
         declarations.push(Declaration {
             id: DeclarationId(877),
@@ -23512,11 +23524,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CompilerKind".to_string(),
-                        ty: DeclarationId(1932),
+                        ty: DeclarationId(1935),
                     },
                     Field {
                         label: "LensInstanceKind".to_string(),
-                        ty: DeclarationId(1933),
+                        ty: DeclarationId(1936),
                     },
                 ],
             },
@@ -23528,7 +23540,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5321, 5430),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5402, 5511),
         });
         declarations.push(Declaration {
             id: DeclarationId(878),
@@ -23549,7 +23561,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "fixes".to_string(),
-                        ty: DeclarationId(1934),
+                        ty: DeclarationId(1937),
                     },
                 ],
             },
@@ -23561,7 +23573,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5799, 5907),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5880, 5988),
         });
         declarations.push(Declaration {
             id: DeclarationId(879),
@@ -23570,31 +23582,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UnderRefined".to_string(),
-                        ty: DeclarationId(1935),
+                        ty: DeclarationId(1938),
                     },
                     Field {
                         label: "NoInhabitant".to_string(),
-                        ty: DeclarationId(1936),
+                        ty: DeclarationId(1939),
                     },
                     Field {
                         label: "ContradictoryUse".to_string(),
-                        ty: DeclarationId(1938),
+                        ty: DeclarationId(1941),
                     },
                     Field {
                         label: "OutOfR2Scope".to_string(),
-                        ty: DeclarationId(1939),
+                        ty: DeclarationId(1942),
                     },
                     Field {
                         label: "LifetimeProgramExtractionPending".to_string(),
-                        ty: DeclarationId(1940),
+                        ty: DeclarationId(1943),
                     },
                     Field {
                         label: "FoldNotImplemented".to_string(),
-                        ty: DeclarationId(1941),
+                        ty: DeclarationId(1944),
                     },
                     Field {
                         label: "MissingEmissionPath".to_string(),
-                        ty: DeclarationId(1942),
+                        ty: DeclarationId(1945),
                     },
                 ],
             },
@@ -23606,7 +23618,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 8541, 11258),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 8622, 11339),
         });
         declarations.push(Declaration {
             id: DeclarationId(880),
@@ -23615,11 +23627,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Inhabits".to_string(),
-                        ty: DeclarationId(1957),
+                        ty: DeclarationId(1960),
                     },
                     Field {
                         label: "Violates".to_string(),
-                        ty: DeclarationId(1958),
+                        ty: DeclarationId(1961),
                     },
                 ],
             },
@@ -23654,11 +23666,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoDiagnostic".to_string(),
-                        ty: DeclarationId(1959),
+                        ty: DeclarationId(1962),
                     },
                     Field {
                         label: "SomeDiagnostic".to_string(),
-                        ty: DeclarationId(1960),
+                        ty: DeclarationId(1963),
                     },
                 ],
             },
@@ -23679,11 +23691,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DimensionOk".to_string(),
-                        ty: DeclarationId(1963),
+                        ty: DeclarationId(1966),
                     },
                     Field {
                         label: "DimensionFail".to_string(),
-                        ty: DeclarationId(1967),
+                        ty: DeclarationId(1970),
                     },
                 ],
             },
@@ -23722,15 +23734,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "witness_of".to_string(),
-                        ty: DeclarationId(1969),
+                        ty: DeclarationId(1972),
                     },
                     Field {
                         label: "compose".to_string(),
-                        ty: DeclarationId(1970),
+                        ty: DeclarationId(1973),
                     },
                     Field {
                         label: "break_diagnostic".to_string(),
-                        ty: DeclarationId(1971),
+                        ty: DeclarationId(1974),
                     },
                 ],
             },
@@ -23770,7 +23782,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             type_params: vec![DeclarationId(888), DeclarationId(889)],
             phantom_params: vec![PhantomParameter {
                 parameter: DeclarationId(888),
-                algebra: DeclarationId(1972),
+                algebra: DeclarationId(1975),
             }],
             meta_tag: None,
             specialization_parent: None,
@@ -23911,11 +23923,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("add_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1943),
-                    DeclarationId(1944),
-                    DeclarationId(1945),
+                    DeclarationId(1946),
+                    DeclarationId(1947),
+                    DeclarationId(1948),
                 ],
-                output: DeclarationId(1946),
+                output: DeclarationId(1949),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)),
             },
             type_params: vec![DeclarationId(898), DeclarationId(899)],
@@ -23961,11 +23973,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("sub_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1947),
-                    DeclarationId(1948),
-                    DeclarationId(1949),
+                    DeclarationId(1950),
+                    DeclarationId(1951),
+                    DeclarationId(1952),
                 ],
-                output: DeclarationId(1950),
+                output: DeclarationId(1953),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)),
             },
             type_params: vec![DeclarationId(901), DeclarationId(902)],
@@ -24010,8 +24022,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(903),
             name: Some("mul_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1951), DeclarationId(1952), DeclarationId(905)],
-                output: DeclarationId(1953),
+                inputs: vec![DeclarationId(1954), DeclarationId(1955), DeclarationId(905)],
+                output: DeclarationId(1956),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)),
             },
             type_params: vec![DeclarationId(904), DeclarationId(905)],
@@ -24056,8 +24068,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(906),
             name: Some("div_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1954), DeclarationId(1955), DeclarationId(908)],
-                output: DeclarationId(1956),
+                inputs: vec![DeclarationId(1957), DeclarationId(1958), DeclarationId(908)],
+                output: DeclarationId(1959),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)),
             },
             type_params: vec![DeclarationId(907), DeclarationId(908)],
@@ -24121,7 +24133,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(1973),
+                        ty: DeclarationId(1976),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -24183,11 +24195,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "BoundUnspecified".to_string(),
-                        ty: DeclarationId(1974),
+                        ty: DeclarationId(1977),
                     },
                     Field {
                         label: "StaticBoundFact".to_string(),
-                        ty: DeclarationId(1975),
+                        ty: DeclarationId(1978),
                     },
                 ],
             },
@@ -24237,11 +24249,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DirectField".to_string(),
-                        ty: DeclarationId(1976),
+                        ty: DeclarationId(1979),
                     },
                     Field {
                         label: "AccessorMethod".to_string(),
-                        ty: DeclarationId(1977),
+                        ty: DeclarationId(1980),
                     },
                 ],
             },
@@ -24344,7 +24356,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "parameters".to_string(),
-                        ty: DeclarationId(1978),
+                        ty: DeclarationId(1981),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -24394,11 +24406,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(1979),
+                        ty: DeclarationId(1982),
                     },
                     Field {
                         label: "Consumed".to_string(),
-                        ty: DeclarationId(1980),
+                        ty: DeclarationId(1983),
                     },
                 ],
             },
@@ -24419,11 +24431,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Owned".to_string(),
-                        ty: DeclarationId(1981),
+                        ty: DeclarationId(1984),
                     },
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(1982),
+                        ty: DeclarationId(1985),
                     },
                 ],
             },
@@ -24444,11 +24456,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SelfContained".to_string(),
-                        ty: DeclarationId(1983),
+                        ty: DeclarationId(1986),
                     },
                     Field {
                         label: "Caller".to_string(),
-                        ty: DeclarationId(1984),
+                        ty: DeclarationId(1987),
                     },
                 ],
             },
@@ -24469,15 +24481,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Growable".to_string(),
-                        ty: DeclarationId(1985),
+                        ty: DeclarationId(1988),
                     },
                     Field {
                         label: "Fixed".to_string(),
-                        ty: DeclarationId(1986),
+                        ty: DeclarationId(1989),
                     },
                     Field {
                         label: "NotApplicable".to_string(),
-                        ty: DeclarationId(1987),
+                        ty: DeclarationId(1990),
                     },
                 ],
             },
@@ -24497,7 +24509,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Utf8FreeMonoidChar".to_string(),
-                    ty: DeclarationId(1988),
+                    ty: DeclarationId(1991),
                 }],
             },
             type_params: vec![],
@@ -24595,43 +24607,43 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ListEmpty".to_string(),
-                        ty: DeclarationId(1989),
+                        ty: DeclarationId(1992),
                     },
                     Field {
                         label: "ListSingleton".to_string(),
-                        ty: DeclarationId(1990),
+                        ty: DeclarationId(1993),
                     },
                     Field {
                         label: "ListCons".to_string(),
-                        ty: DeclarationId(1991),
+                        ty: DeclarationId(1994),
                     },
                     Field {
                         label: "ListConcat".to_string(),
-                        ty: DeclarationId(1992),
+                        ty: DeclarationId(1995),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(1993),
+                        ty: DeclarationId(1996),
                     },
                     Field {
                         label: "ListIsEmpty".to_string(),
-                        ty: DeclarationId(1994),
+                        ty: DeclarationId(1997),
                     },
                     Field {
                         label: "ListFold".to_string(),
-                        ty: DeclarationId(1995),
+                        ty: DeclarationId(1998),
                     },
                     Field {
                         label: "ListMap".to_string(),
-                        ty: DeclarationId(1996),
+                        ty: DeclarationId(1999),
                     },
                     Field {
                         label: "ListFilter".to_string(),
-                        ty: DeclarationId(1997),
+                        ty: DeclarationId(2000),
                     },
                     Field {
                         label: "ListContains".to_string(),
-                        ty: DeclarationId(1998),
+                        ty: DeclarationId(2001),
                     },
                 ],
             },
@@ -24713,11 +24725,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PlaceholderPatternStrategy".to_string(),
-                        ty: DeclarationId(1999),
+                        ty: DeclarationId(2002),
                     },
                     Field {
                         label: "VectorList".to_string(),
-                        ty: DeclarationId(2000),
+                        ty: DeclarationId(2003),
                     },
                 ],
             },
@@ -25180,11 +25192,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Borrow".to_string(),
-                        ty: DeclarationId(2001),
+                        ty: DeclarationId(2004),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(2002),
+                        ty: DeclarationId(2005),
                     },
                 ],
             },
@@ -25205,11 +25217,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CopyOrClone".to_string(),
-                        ty: DeclarationId(2003),
+                        ty: DeclarationId(2006),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(2004),
+                        ty: DeclarationId(2007),
                     },
                 ],
             },
@@ -25295,11 +25307,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IndexedArgs".to_string(),
-                        ty: DeclarationId(2005),
+                        ty: DeclarationId(2008),
                     },
                     Field {
                         label: "NamedArg".to_string(),
-                        ty: DeclarationId(2006),
+                        ty: DeclarationId(2009),
                     },
                 ],
             },
@@ -25320,11 +25332,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SingleTemplate".to_string(),
-                        ty: DeclarationId(2007),
+                        ty: DeclarationId(2010),
                     },
                     Field {
                         label: "HigherOrderTemplates".to_string(),
-                        ty: DeclarationId(2008),
+                        ty: DeclarationId(2011),
                     },
                 ],
             },
@@ -25526,7 +25538,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({left}, {right}...)".to_string(),
                             ))],
@@ -25539,7 +25551,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -25577,7 +25589,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "int64(len({recv}))".to_string(),
                             ))],
@@ -25590,7 +25602,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -25628,7 +25640,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv}) == 0".to_string(),
                             ))],
@@ -25641,7 +25653,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -25681,7 +25693,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* fold({recv}, {init}, {body}) */".to_string(),
                             ))],
@@ -25694,7 +25706,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -25716,7 +25728,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2009)),
+            meta_tag: Some(DeclarationId(2012)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -25735,7 +25747,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -25748,7 +25760,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -25770,7 +25782,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Join({recv}, {arg})".to_string(),
                             ))],
@@ -25783,7 +25795,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -25805,7 +25817,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Split({recv}, {arg})".to_string(),
                             ))],
@@ -25818,7 +25830,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -25840,7 +25852,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Map({recv}, {arg})".to_string(),
                             ))],
@@ -25853,7 +25865,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -25875,7 +25887,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Filter({recv}, {arg})".to_string(),
                             ))],
@@ -25888,7 +25900,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -25910,7 +25922,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Any({recv}, {arg})".to_string(),
                             ))],
@@ -25923,7 +25935,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -25945,7 +25957,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.All({recv}, {arg})".to_string(),
                             ))],
@@ -25958,7 +25970,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -25980,7 +25992,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.FlatMap({recv}, {arg})".to_string(),
                             ))],
@@ -25993,7 +26005,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -26013,7 +26025,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -26026,7 +26038,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -26046,7 +26058,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -26059,7 +26071,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -26081,7 +26093,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.SortBy({recv}, {arg})".to_string(),
                             ))],
@@ -26094,7 +26106,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -26116,7 +26128,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({recv}, {arg})".to_string(),
                             ))],
@@ -26129,7 +26141,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -26151,7 +26163,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Contains({recv}, {arg})".to_string(),
                             ))],
@@ -26164,7 +26176,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -26181,23 +26193,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DirectRecursion".to_string(),
-                        ty: DeclarationId(2019),
+                        ty: DeclarationId(2022),
                     },
                     Field {
                         label: "ListRecursion".to_string(),
-                        ty: DeclarationId(2020),
+                        ty: DeclarationId(2023),
                     },
                     Field {
                         label: "OptionalRecursion".to_string(),
-                        ty: DeclarationId(2021),
+                        ty: DeclarationId(2024),
                     },
                     Field {
                         label: "SetRecursion".to_string(),
-                        ty: DeclarationId(2022),
+                        ty: DeclarationId(2025),
                     },
                     Field {
                         label: "MapValueRecursion".to_string(),
-                        ty: DeclarationId(2023),
+                        ty: DeclarationId(2026),
                     },
                 ],
             },
@@ -26309,23 +26321,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "StrictSubValue".to_string(),
-                        ty: DeclarationId(2024),
+                        ty: DeclarationId(2027),
                     },
                     Field {
                         label: "IteratedSubValue".to_string(),
-                        ty: DeclarationId(2025),
+                        ty: DeclarationId(2028),
                     },
                     Field {
                         label: "ArithmeticDescent".to_string(),
-                        ty: DeclarationId(2026),
+                        ty: DeclarationId(2029),
                     },
                     Field {
                         label: "PreservedValue".to_string(),
-                        ty: DeclarationId(2027),
+                        ty: DeclarationId(2030),
                     },
                     Field {
                         label: "SubValueUnknown".to_string(),
-                        ty: DeclarationId(2028),
+                        ty: DeclarationId(2031),
                     },
                 ],
             },
@@ -26476,7 +26488,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("sub_value_to_call_pattern".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(961)],
-                output: DeclarationId(2010),
+                output: DeclarationId(2013),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     20518,
@@ -26498,7 +26510,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("sub_value_to_lowering_target".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(961)],
-                output: DeclarationId(2011),
+                output: DeclarationId(2014),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     21906,
@@ -26522,19 +26534,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IntegerExpZero".to_string(),
-                        ty: DeclarationId(2029),
+                        ty: DeclarationId(2032),
                     },
                     Field {
                         label: "IntegerExpPos".to_string(),
-                        ty: DeclarationId(2030),
+                        ty: DeclarationId(2033),
                     },
                     Field {
                         label: "FractionExp".to_string(),
-                        ty: DeclarationId(2031),
+                        ty: DeclarationId(2034),
                     },
                     Field {
                         label: "LogBasedExp".to_string(),
-                        ty: DeclarationId(2032),
+                        ty: DeclarationId(2035),
                     },
                 ],
             },
@@ -26577,11 +26589,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PolyCost".to_string(),
-                        ty: DeclarationId(2033),
+                        ty: DeclarationId(2036),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(2034),
+                        ty: DeclarationId(2037),
                     },
                 ],
             },
@@ -26602,31 +26614,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ConstantBound".to_string(),
-                        ty: DeclarationId(2035),
+                        ty: DeclarationId(2038),
                     },
                     Field {
                         label: "AtomicBound".to_string(),
-                        ty: DeclarationId(2036),
+                        ty: DeclarationId(2039),
                     },
                     Field {
                         label: "ProductBound".to_string(),
-                        ty: DeclarationId(2038),
+                        ty: DeclarationId(2041),
                     },
                     Field {
                         label: "SumOfProductsBound".to_string(),
-                        ty: DeclarationId(2041),
+                        ty: DeclarationId(2044),
                     },
                     Field {
                         label: "SumBound".to_string(),
-                        ty: DeclarationId(2043),
+                        ty: DeclarationId(2046),
                     },
                     Field {
                         label: "ForeverBound".to_string(),
-                        ty: DeclarationId(2044),
+                        ty: DeclarationId(2047),
                     },
                     Field {
                         label: "ErrorBound".to_string(),
-                        ty: DeclarationId(2045),
+                        ty: DeclarationId(2048),
                     },
                 ],
             },
@@ -26644,7 +26656,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(974),
             name: Some("sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2012)],
+                inputs: vec![DeclarationId(2015)],
                 output: DeclarationId(973),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -26920,7 +26932,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("int_add_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(2013),
+                output: DeclarationId(2016),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     31955,
@@ -26942,7 +26954,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("int_mul_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(2014),
+                output: DeclarationId(2017),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     32251,
@@ -26964,7 +26976,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("bounded_int_pow_exponent".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2015),
+                output: DeclarationId(2018),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33500,
@@ -26986,7 +26998,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("int_pow_bounded".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(2016),
+                output: DeclarationId(2019),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33975,
@@ -27008,7 +27020,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("ceil_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(2017),
+                output: DeclarationId(2020),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35238,
@@ -27035,7 +27047,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     DeclarationId(81),
                     DeclarationId(81),
                 ],
-                output: DeclarationId(2018),
+                output: DeclarationId(2021),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35510,
@@ -27443,7 +27455,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2046)),
+            meta_tag: Some(DeclarationId(2049)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -27469,7 +27481,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2047)),
+            meta_tag: Some(DeclarationId(2050)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -27494,23 +27506,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(2049),
+                        ty: DeclarationId(2052),
                     },
                     Field {
                         label: "sequential".to_string(),
-                        ty: DeclarationId(2050),
+                        ty: DeclarationId(2053),
                     },
                     Field {
                         label: "branch".to_string(),
-                        ty: DeclarationId(2051),
+                        ty: DeclarationId(2054),
                     },
                     Field {
                         label: "iterate".to_string(),
-                        ty: DeclarationId(2052),
+                        ty: DeclarationId(2055),
                     },
                     Field {
                         label: "validate".to_string(),
-                        ty: DeclarationId(2053),
+                        ty: DeclarationId(2056),
                     },
                 ],
             },
@@ -27545,11 +27557,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Miss".to_string(),
-                        ty: DeclarationId(2056),
+                        ty: DeclarationId(2059),
                     },
                     Field {
                         label: "Hit".to_string(),
-                        ty: DeclarationId(2057),
+                        ty: DeclarationId(2060),
                     },
                 ],
             },
@@ -27582,7 +27594,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("miss_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2054),
+                output: DeclarationId(2057),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4589, 4599)),
             },
             type_params: vec![],
@@ -27600,7 +27612,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("hit_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2055),
+                output: DeclarationId(2058),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4642, 4654)),
             },
             type_params: vec![],
@@ -27641,7 +27653,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[*{left}, *{right}]".to_string(),
                             ))],
@@ -27654,7 +27666,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -27696,7 +27708,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -27709,7 +27721,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -27751,7 +27763,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "(len({recv}) == 0)".to_string(),
                             ))],
@@ -27764,7 +27776,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -27808,7 +27820,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "__v3_fold({recv}, {init}, {body})".to_string(),
                             ))],
@@ -27821,7 +27833,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -27847,7 +27859,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2058)),
+            meta_tag: Some(DeclarationId(2061)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -27866,7 +27878,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -27879,7 +27891,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -27899,7 +27911,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg}.join({recv})".to_string(),
                             ))],
@@ -27912,7 +27924,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -27932,7 +27944,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}.split({arg})".to_string(),
                             ))],
@@ -27945,7 +27957,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -27967,7 +27979,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[-1] if {recv} else None".to_string(),
                             ))],
@@ -27980,7 +27992,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -28002,7 +28014,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[0] if {recv} else None".to_string(),
                             ))],
@@ -28015,7 +28027,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -28037,7 +28049,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "list(enumerate({recv}))".to_string(),
                             ))],
@@ -28050,7 +28062,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -28072,7 +28084,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[ord(c) for c in {recv}]".to_string(),
                             ))],
@@ -28085,7 +28097,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -28107,7 +28119,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[{arg}(x) for x in {recv}]".to_string(),
                             ))],
@@ -28120,7 +28132,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -28142,7 +28154,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[x for x in {recv} if {arg}(x)]".to_string(),
                             ))],
@@ -28155,7 +28167,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -28177,7 +28189,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "any({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -28190,7 +28202,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -28212,7 +28224,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "all({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -28225,7 +28237,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -28247,7 +28259,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[y for x in {recv} for y in {arg}(x)]".to_string(),
                             ))],
@@ -28260,7 +28272,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -28280,7 +28292,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -28293,7 +28305,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -28313,7 +28325,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -28326,7 +28338,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -28348,7 +28360,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "sorted({recv}, key={arg})".to_string(),
                             ))],
@@ -28361,7 +28373,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -28381,7 +28393,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv} + [{arg}]".to_string(),
                             ))],
@@ -28394,7 +28406,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -28414,7 +28426,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg} in {recv}".to_string(),
                             ))],
@@ -28427,7 +28439,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -28525,23 +28537,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LiteralValue".to_string(),
-                        ty: DeclarationId(2059),
+                        ty: DeclarationId(2062),
                     },
                     Field {
                         label: "RecordValue".to_string(),
-                        ty: DeclarationId(2061),
+                        ty: DeclarationId(2064),
                     },
                     Field {
                         label: "VariantValue".to_string(),
-                        ty: DeclarationId(2062),
+                        ty: DeclarationId(2065),
                     },
                     Field {
                         label: "NodeRef".to_string(),
-                        ty: DeclarationId(2063),
+                        ty: DeclarationId(2066),
                     },
                     Field {
                         label: "CardinalityValue".to_string(),
-                        ty: DeclarationId(2064),
+                        ty: DeclarationId(2067),
                     },
                 ],
             },
@@ -28594,7 +28606,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bindings".to_string(),
-                    ty: DeclarationId(2065),
+                    ty: DeclarationId(2068),
                 }],
             },
             type_params: vec![],
@@ -28613,7 +28625,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "frames".to_string(),
-                    ty: DeclarationId(2066),
+                    ty: DeclarationId(2069),
                 }],
             },
             type_params: vec![],
@@ -28651,7 +28663,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "ApplicativeOrder".to_string(),
-                    ty: DeclarationId(2067),
+                    ty: DeclarationId(2070),
                 }],
             },
             type_params: vec![],
@@ -28670,7 +28682,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LeftFirst".to_string(),
-                    ty: DeclarationId(2068),
+                    ty: DeclarationId(2071),
                 }],
             },
             type_params: vec![],
@@ -28716,7 +28728,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/runtime.dag", 6042, 6153),
         });
-        declarations.push(Declaration { id: DeclarationId(1034), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(607), arguments: vec![TemplateArgument { parameter: DeclarationId(608), value: DeclarationId(947) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2069)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2007), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2006), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(238)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2007), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2006), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2007), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2006), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(240)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2007), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2006), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2007), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2006), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2007), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2006), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2007), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2006), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2008), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2006), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2008), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2006), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2008), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2006), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2008), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2006), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(260)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2007), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2006), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(266)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2007), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2006), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) });
+        declarations.push(Declaration { id: DeclarationId(1034), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(607), arguments: vec![TemplateArgument { parameter: DeclarationId(608), value: DeclarationId(947) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2072)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2010), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2009), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(238)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2010), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2009), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2010), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2009), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(240)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2010), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2009), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2010), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2009), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2010), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2009), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2010), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2009), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2011), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2009), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2011), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2009), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2011), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2009), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2011), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2009), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(260)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2010), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2009), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(266)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2010), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2009), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) });
         declarations.push(Declaration {
             id: DeclarationId(1035),
             name: Some("InputField".to_string()),
@@ -28786,7 +28798,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2070),
+                        ty: DeclarationId(2073),
                     },
                     Field {
                         label: "endpoint".to_string(),
@@ -28811,15 +28823,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Strict".to_string(),
-                        ty: DeclarationId(2078),
+                        ty: DeclarationId(2081),
                     },
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2079),
+                        ty: DeclarationId(2082),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2080),
+                        ty: DeclarationId(2083),
                     },
                 ],
             },
@@ -28917,8 +28929,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1044),
             name: Some("optional_evidence_meet".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2071), DeclarationId(2072)],
-                output: DeclarationId(2073),
+                inputs: vec![DeclarationId(2074), DeclarationId(2075)],
+                output: DeclarationId(2076),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2388,
@@ -28939,8 +28951,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1045),
             name: Some("map_evidence_merge_at".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2074), DeclarationId(197), DeclarationId(1039)],
-                output: DeclarationId(2075),
+                inputs: vec![DeclarationId(2077), DeclarationId(197), DeclarationId(1039)],
+                output: DeclarationId(2078),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2733,
@@ -28964,23 +28976,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2081),
+                        ty: DeclarationId(2084),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2082),
+                        ty: DeclarationId(2085),
                     },
                     Field {
                         label: "ArithmeticValue".to_string(),
-                        ty: DeclarationId(2083),
+                        ty: DeclarationId(2086),
                     },
                     Field {
                         label: "TokenPosition".to_string(),
-                        ty: DeclarationId(2084),
+                        ty: DeclarationId(2087),
                     },
                     Field {
                         label: "SetCardinality".to_string(),
-                        ty: DeclarationId(2085),
+                        ty: DeclarationId(2088),
                     },
                 ],
             },
@@ -29001,11 +29013,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "OneStep".to_string(),
-                        ty: DeclarationId(2086),
+                        ty: DeclarationId(2089),
                     },
                     Field {
                         label: "AdditionalStep".to_string(),
-                        ty: DeclarationId(2087),
+                        ty: DeclarationId(2090),
                     },
                 ],
             },
@@ -29026,11 +29038,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DivideByTwo".to_string(),
-                        ty: DeclarationId(2088),
+                        ty: DeclarationId(2091),
                     },
                     Field {
                         label: "StrictlyLarger".to_string(),
-                        ty: DeclarationId(2089),
+                        ty: DeclarationId(2092),
                     },
                 ],
             },
@@ -29093,7 +29105,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("positive_descent_amount_from_positive_int".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2076),
+                output: DeclarationId(2079),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     5902,
@@ -29115,7 +29127,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("proportional_divisor_from_int_at_least_two".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2077),
+                output: DeclarationId(2080),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6342,
@@ -29139,31 +29151,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ChildAccessor".to_string(),
-                        ty: DeclarationId(2090),
+                        ty: DeclarationId(2093),
                     },
                     Field {
                         label: "ListShrink".to_string(),
-                        ty: DeclarationId(2091),
+                        ty: DeclarationId(2094),
                     },
                     Field {
                         label: "ArithmeticSubtractDescent".to_string(),
-                        ty: DeclarationId(2092),
+                        ty: DeclarationId(2095),
                     },
                     Field {
                         label: "ArithmeticDivideDescent".to_string(),
-                        ty: DeclarationId(2093),
+                        ty: DeclarationId(2096),
                     },
                     Field {
                         label: "ParserAdvance".to_string(),
-                        ty: DeclarationId(2094),
+                        ty: DeclarationId(2097),
                     },
                     Field {
                         label: "SetRemoval".to_string(),
-                        ty: DeclarationId(2095),
+                        ty: DeclarationId(2098),
                     },
                     Field {
                         label: "FoldIteration".to_string(),
-                        ty: DeclarationId(2096),
+                        ty: DeclarationId(2099),
                     },
                 ],
             },
@@ -29183,7 +29195,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "dimensions".to_string(),
-                    ty: DeclarationId(2097),
+                    ty: DeclarationId(2100),
                 }],
             },
             type_params: vec![],
@@ -29211,7 +29223,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(2098),
+                        ty: DeclarationId(2101),
                     },
                 ],
             },
@@ -29232,183 +29244,183 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2099),
+                        ty: DeclarationId(2102),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2100),
+                        ty: DeclarationId(2103),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2101),
+                        ty: DeclarationId(2104),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2102),
+                        ty: DeclarationId(2105),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2103),
+                        ty: DeclarationId(2106),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2104),
+                        ty: DeclarationId(2107),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2105),
+                        ty: DeclarationId(2108),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2106),
+                        ty: DeclarationId(2109),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2107),
+                        ty: DeclarationId(2110),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2108),
+                        ty: DeclarationId(2111),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2109),
+                        ty: DeclarationId(2112),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2110),
+                        ty: DeclarationId(2113),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2111),
+                        ty: DeclarationId(2114),
                     },
                     Field {
                         label: "Ident".to_string(),
-                        ty: DeclarationId(2112),
+                        ty: DeclarationId(2115),
                     },
                     Field {
                         label: "IntLit".to_string(),
-                        ty: DeclarationId(2113),
+                        ty: DeclarationId(2116),
                     },
                     Field {
                         label: "StringLit".to_string(),
-                        ty: DeclarationId(2114),
+                        ty: DeclarationId(2117),
                     },
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2115),
+                        ty: DeclarationId(2118),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2116),
+                        ty: DeclarationId(2119),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2117),
+                        ty: DeclarationId(2120),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2118),
+                        ty: DeclarationId(2121),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2119),
+                        ty: DeclarationId(2122),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2120),
+                        ty: DeclarationId(2123),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2121),
+                        ty: DeclarationId(2124),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2122),
+                        ty: DeclarationId(2125),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2123),
+                        ty: DeclarationId(2126),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2124),
+                        ty: DeclarationId(2127),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2125),
+                        ty: DeclarationId(2128),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2126),
+                        ty: DeclarationId(2129),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2127),
+                        ty: DeclarationId(2130),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2128),
+                        ty: DeclarationId(2131),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2129),
+                        ty: DeclarationId(2132),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2130),
+                        ty: DeclarationId(2133),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2131),
+                        ty: DeclarationId(2134),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2132),
+                        ty: DeclarationId(2135),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2133),
+                        ty: DeclarationId(2136),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2134),
+                        ty: DeclarationId(2137),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2135),
+                        ty: DeclarationId(2138),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2136),
+                        ty: DeclarationId(2139),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2137),
+                        ty: DeclarationId(2140),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2138),
+                        ty: DeclarationId(2141),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2139),
+                        ty: DeclarationId(2142),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2140),
+                        ty: DeclarationId(2143),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2141),
+                        ty: DeclarationId(2144),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2142),
+                        ty: DeclarationId(2145),
                     },
                     Field {
                         label: "Eof".to_string(),
-                        ty: DeclarationId(2143),
+                        ty: DeclarationId(2146),
                     },
                 ],
             },
@@ -29454,55 +29466,55 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2144),
+                        ty: DeclarationId(2147),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2145),
+                        ty: DeclarationId(2148),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2146),
+                        ty: DeclarationId(2149),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2147),
+                        ty: DeclarationId(2150),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2148),
+                        ty: DeclarationId(2151),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2149),
+                        ty: DeclarationId(2152),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2150),
+                        ty: DeclarationId(2153),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2151),
+                        ty: DeclarationId(2154),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2152),
+                        ty: DeclarationId(2155),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2153),
+                        ty: DeclarationId(2156),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2154),
+                        ty: DeclarationId(2157),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2155),
+                        ty: DeclarationId(2158),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2156),
+                        ty: DeclarationId(2159),
                     },
                 ],
             },
@@ -29523,115 +29535,115 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2157),
+                        ty: DeclarationId(2160),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2158),
+                        ty: DeclarationId(2161),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2159),
+                        ty: DeclarationId(2162),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2160),
+                        ty: DeclarationId(2163),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2161),
+                        ty: DeclarationId(2164),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2162),
+                        ty: DeclarationId(2165),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2163),
+                        ty: DeclarationId(2166),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2164),
+                        ty: DeclarationId(2167),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2165),
+                        ty: DeclarationId(2168),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2166),
+                        ty: DeclarationId(2169),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2167),
+                        ty: DeclarationId(2170),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2168),
+                        ty: DeclarationId(2171),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2169),
+                        ty: DeclarationId(2172),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2170),
+                        ty: DeclarationId(2173),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2171),
+                        ty: DeclarationId(2174),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2172),
+                        ty: DeclarationId(2175),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2173),
+                        ty: DeclarationId(2176),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2174),
+                        ty: DeclarationId(2177),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2175),
+                        ty: DeclarationId(2178),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2176),
+                        ty: DeclarationId(2179),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2177),
+                        ty: DeclarationId(2180),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2178),
+                        ty: DeclarationId(2181),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2179),
+                        ty: DeclarationId(2182),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2180),
+                        ty: DeclarationId(2183),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2181),
+                        ty: DeclarationId(2184),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2182),
+                        ty: DeclarationId(2185),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2183),
+                        ty: DeclarationId(2186),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2184),
+                        ty: DeclarationId(2187),
                     },
                 ],
             },
@@ -29846,31 +29858,43 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2188),
+                        ty: DeclarationId(2191),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2189),
+                        ty: DeclarationId(2192),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2190),
+                        ty: DeclarationId(2193),
+                    },
+                    Field {
+                        label: "ArityMismatch".to_string(),
+                        ty: DeclarationId(2194),
+                    },
+                    Field {
+                        label: "ResolveError".to_string(),
+                        ty: DeclarationId(2195),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2191),
+                        ty: DeclarationId(2196),
                     },
                     Field {
-                        label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2192),
+                        label: "BranchConditionNotBool".to_string(),
+                        ty: DeclarationId(2197),
                     },
                     Field {
-                        label: "ResolveError".to_string(),
-                        ty: DeclarationId(2193),
+                        label: "MagnitudeOutOfRange".to_string(),
+                        ty: DeclarationId(2198),
+                    },
+                    Field {
+                        label: "MalformedIntegerRangeFact".to_string(),
+                        ty: DeclarationId(2199),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2194),
+                        ty: DeclarationId(2200),
                     },
                 ],
             },
@@ -29882,7 +29906,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2456, 2606),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2456, 2687),
         });
         declarations.push(Declaration {
             id: DeclarationId(1072),
@@ -29891,11 +29915,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "AnyDetail".to_string(),
-                        ty: DeclarationId(2195),
+                        ty: DeclarationId(2201),
                     },
                     Field {
                         label: "Contains".to_string(),
-                        ty: DeclarationId(2196),
+                        ty: DeclarationId(2202),
                     },
                 ],
             },
@@ -29907,7 +29931,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2975, 3042),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3056, 3123),
         });
         declarations.push(Declaration {
             id: DeclarationId(1073),
@@ -29932,7 +29956,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3186, 3284),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3267, 3365),
         });
         declarations.push(Declaration {
             id: DeclarationId(1074),
@@ -29941,11 +29965,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(2197),
+                        ty: DeclarationId(2203),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(2198),
+                        ty: DeclarationId(2204),
                     },
                 ],
             },
@@ -29957,7 +29981,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3671, 3724),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3752, 3805),
         });
         declarations.push(Declaration {
             id: DeclarationId(1075),
@@ -29966,15 +29990,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Associativity".to_string(),
-                        ty: DeclarationId(2199),
+                        ty: DeclarationId(2205),
                     },
                     Field {
                         label: "Commutativity".to_string(),
-                        ty: DeclarationId(2200),
+                        ty: DeclarationId(2206),
                     },
                     Field {
                         label: "Identity".to_string(),
-                        ty: DeclarationId(2201),
+                        ty: DeclarationId(2207),
                     },
                 ],
             },
@@ -29986,7 +30010,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4513, 4583),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4594, 4664),
         });
         declarations.push(Declaration {
             id: DeclarationId(1076),
@@ -29995,95 +30019,95 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Compiles".to_string(),
-                        ty: DeclarationId(2202),
+                        ty: DeclarationId(2208),
                     },
                     Field {
                         label: "FailsWithDiagnostic".to_string(),
-                        ty: DeclarationId(2203),
+                        ty: DeclarationId(2209),
                     },
                     Field {
                         label: "OutputEquals".to_string(),
-                        ty: DeclarationId(2204),
+                        ty: DeclarationId(2210),
                     },
                     Field {
                         label: "PortHasState".to_string(),
-                        ty: DeclarationId(2205),
+                        ty: DeclarationId(2211),
                     },
                     Field {
                         label: "DeclarationHasRefinement".to_string(),
-                        ty: DeclarationId(2206),
+                        ty: DeclarationId(2212),
                     },
                     Field {
                         label: "CostBounded".to_string(),
-                        ty: DeclarationId(2207),
+                        ty: DeclarationId(2213),
                     },
                     Field {
                         label: "BehavioralObservation".to_string(),
-                        ty: DeclarationId(2208),
+                        ty: DeclarationId(2214),
                     },
                     Field {
                         label: "MockBackedInvariant".to_string(),
-                        ty: DeclarationId(2209),
+                        ty: DeclarationId(2215),
                     },
                     Field {
                         label: "ExecuteCommand".to_string(),
-                        ty: DeclarationId(2211),
+                        ty: DeclarationId(2217),
                     },
                     Field {
                         label: "ForAllTargets".to_string(),
-                        ty: DeclarationId(2213),
+                        ty: DeclarationId(2219),
                     },
                     Field {
                         label: "LensOutputEquals".to_string(),
-                        ty: DeclarationId(2214),
+                        ty: DeclarationId(2220),
                     },
                     Field {
                         label: "DifferentialEquals".to_string(),
-                        ty: DeclarationId(2215),
+                        ty: DeclarationId(2221),
                     },
                     Field {
                         label: "SymbolicCostExprEquals".to_string(),
-                        ty: DeclarationId(2216),
+                        ty: DeclarationId(2222),
                     },
                     Field {
                         label: "BinaryDimensionReportEquals".to_string(),
-                        ty: DeclarationId(2217),
+                        ty: DeclarationId(2223),
                     },
                     Field {
                         label: "AlgebraicLaw".to_string(),
-                        ty: DeclarationId(2218),
+                        ty: DeclarationId(2224),
                     },
                     Field {
                         label: "CensusBoundCheck".to_string(),
-                        ty: DeclarationId(2219),
+                        ty: DeclarationId(2225),
                     },
                     Field {
                         label: "CensusSubsetCount".to_string(),
-                        ty: DeclarationId(2220),
+                        ty: DeclarationId(2226),
                     },
                     Field {
                         label: "FixedPointConverges".to_string(),
-                        ty: DeclarationId(2221),
+                        ty: DeclarationId(2227),
                     },
                     Field {
                         label: "RatchetZero".to_string(),
-                        ty: DeclarationId(2222),
+                        ty: DeclarationId(2228),
                     },
                     Field {
                         label: "GeneratedFromDag".to_string(),
-                        ty: DeclarationId(2224),
+                        ty: DeclarationId(2230),
                     },
                     Field {
                         label: "ReleaseDeferredClaim".to_string(),
-                        ty: DeclarationId(2225),
+                        ty: DeclarationId(2231),
                     },
                     Field {
                         label: "SubstrateResearchDeferredClaim".to_string(),
-                        ty: DeclarationId(2226),
+                        ty: DeclarationId(2232),
                     },
                     Field {
                         label: "BridgeLedgerZero".to_string(),
-                        ty: DeclarationId(2227),
+                        ty: DeclarationId(2233),
                     },
                 ],
             },
@@ -30095,7 +30119,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4585, 14920),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4666, 15001),
         });
         declarations.push(Declaration {
             id: DeclarationId(1077),
@@ -30109,7 +30133,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15028, 15048),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15109, 15129),
         });
         declarations.push(Declaration {
             id: DeclarationId(1078),
@@ -30128,7 +30152,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15191, 15246),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15272, 15327),
         });
         declarations.push(Declaration {
             id: DeclarationId(1079),
@@ -30153,7 +30177,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2228),
+                        ty: DeclarationId(2234),
                     },
                 ],
             },
@@ -30165,7 +30189,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15856, 15989),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15937, 16070),
         });
         declarations.push(Declaration {
             id: DeclarationId(1080),
@@ -30178,7 +30202,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "claims".to_string(),
-                        ty: DeclarationId(2229),
+                        ty: DeclarationId(2235),
                     },
                 ],
             },
@@ -30190,7 +30214,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15991, 16050),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16072, 16131),
         });
         declarations.push(Declaration {
             id: DeclarationId(1081),
@@ -30203,7 +30227,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "resources".to_string(),
-                        ty: DeclarationId(2230),
+                        ty: DeclarationId(2236),
                     },
                 ],
             },
@@ -30215,18 +30239,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16248, 16329),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16329, 16410),
         });
         declarations.push(Declaration {
             id: DeclarationId(1082),
             name: Some("claim_obligation_resources".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1079)],
-                output: DeclarationId(2185),
+                output: DeclarationId(2188),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    16771,
-                    16787,
+                    16852,
+                    16868,
                 )),
             },
             type_params: vec![],
@@ -30237,7 +30261,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16700, 16787),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16781, 16868),
         });
         declarations.push(Declaration {
             id: DeclarationId(1083),
@@ -30247,8 +30271,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 output: DeclarationId(1081),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    16845,
-                    16930,
+                    16926,
+                    17011,
                 )),
             },
             type_params: vec![],
@@ -30259,18 +30283,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16789, 16930),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16870, 17011),
         });
         declarations.push(Declaration {
             id: DeclarationId(1084),
             name: Some("materialize_test_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2186)],
-                output: DeclarationId(2187),
+                inputs: vec![DeclarationId(2189)],
+                output: DeclarationId(2190),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    17013,
-                    17052,
+                    17094,
+                    17133,
                 )),
             },
             type_params: vec![],
@@ -30281,14 +30305,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16932, 17052),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17013, 17133),
         });
         declarations.push(Declaration {
             id: DeclarationId(1085),
             name: Some("behavior_spine".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(748)],
-                output: DeclarationId(2231),
+                output: DeclarationId(2237),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(280))),
             },
             type_params: vec![],
@@ -30589,7 +30613,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1975),
+                            constructor: DeclarationId(1978),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1608),
                                 payload: vec![
@@ -30885,7 +30909,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1976),
+                                    constructor: DeclarationId(1979),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -30983,7 +31007,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -31002,7 +31026,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state".to_string(),
                                         ))],
@@ -31023,7 +31047,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -31084,7 +31108,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -31103,7 +31127,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -31122,7 +31146,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -31413,7 +31437,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -31432,7 +31456,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -31495,7 +31519,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -31514,7 +31538,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -31577,7 +31601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -31596,7 +31620,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -31658,7 +31682,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1976),
+                                    constructor: DeclarationId(1979),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -31718,7 +31742,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -31737,7 +31761,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -31798,7 +31822,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -31817,7 +31841,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -31878,7 +31902,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -31897,7 +31921,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -31916,7 +31940,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -31977,7 +32001,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1977),
+                                        constructor: DeclarationId(1980),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -31996,7 +32020,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1977),
+                                        constructor: DeclarationId(1980),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -32056,7 +32080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1977),
+                                    constructor: DeclarationId(1980),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -32115,7 +32139,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1976),
+                                    constructor: DeclarationId(1979),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -32174,7 +32198,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1976),
+                                    constructor: DeclarationId(1979),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -32234,7 +32258,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -32255,7 +32279,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -32468,7 +32492,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -32487,7 +32511,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -32508,7 +32532,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -32529,7 +32553,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -32550,7 +32574,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -32571,7 +32595,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -32592,7 +32616,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -32613,7 +32637,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -32634,7 +32658,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -32653,7 +32677,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -32944,7 +32968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -32965,7 +32989,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -33026,7 +33050,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -33047,7 +33071,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33066,7 +33090,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -33085,7 +33109,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -33184,7 +33208,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33203,7 +33227,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -33224,7 +33248,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33243,7 +33267,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33304,7 +33328,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33323,7 +33347,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -33342,7 +33366,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -33363,7 +33387,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33382,7 +33406,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33443,7 +33467,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33462,7 +33486,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -33481,7 +33505,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -33502,7 +33526,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33521,7 +33545,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33542,7 +33566,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -33603,7 +33627,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33622,7 +33646,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -33641,7 +33665,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -33660,7 +33684,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -33679,7 +33703,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -33700,7 +33724,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33719,7 +33743,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33780,7 +33804,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33799,7 +33823,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -33820,7 +33844,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33839,7 +33863,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -33858,7 +33882,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33879,7 +33903,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -33980,7 +34004,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -33999,7 +34023,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -34018,7 +34042,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -34039,7 +34063,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -35097,7 +35121,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1989),
+                            constructor: DeclarationId(1992),
                             payload: vec![],
                         },
                     ),
@@ -35134,7 +35158,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1990),
+                            constructor: DeclarationId(1993),
                             payload: vec![],
                         },
                     ),
@@ -35145,7 +35169,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1980),
+                                    constructor: DeclarationId(1983),
                                     payload: vec![],
                                 },
                             ),
@@ -35183,7 +35207,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1991),
+                            constructor: DeclarationId(1994),
                             payload: vec![],
                         },
                     ),
@@ -35195,7 +35219,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1980),
+                                        constructor: DeclarationId(1983),
                                         payload: vec![],
                                     },
                                 ),
@@ -35205,7 +35229,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1980),
+                                        constructor: DeclarationId(1983),
                                         payload: vec![],
                                     },
                                 ),
@@ -35244,7 +35268,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1992),
+                            constructor: DeclarationId(1995),
                             payload: vec![],
                         },
                     ),
@@ -35256,7 +35280,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1980),
+                                        constructor: DeclarationId(1983),
                                         payload: vec![],
                                     },
                                 ),
@@ -35266,7 +35290,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1980),
+                                        constructor: DeclarationId(1983),
                                         payload: vec![],
                                     },
                                 ),
@@ -35305,7 +35329,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1993),
+                            constructor: DeclarationId(1996),
                             payload: vec![],
                         },
                     ),
@@ -35316,7 +35340,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1979),
+                                    constructor: DeclarationId(1982),
                                     payload: vec![],
                                 },
                             ),
@@ -35455,7 +35479,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1994),
+                            constructor: DeclarationId(1997),
                             payload: vec![],
                         },
                     ),
@@ -35466,7 +35490,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1979),
+                                    constructor: DeclarationId(1982),
                                     payload: vec![],
                                 },
                             ),
@@ -35504,7 +35528,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1995),
+                            constructor: DeclarationId(1998),
                             payload: vec![],
                         },
                     ),
@@ -35516,7 +35540,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -35526,7 +35550,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1980),
+                                        constructor: DeclarationId(1983),
                                         payload: vec![],
                                     },
                                 ),
@@ -35536,7 +35560,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -35575,7 +35599,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1996),
+                            constructor: DeclarationId(1999),
                             payload: vec![],
                         },
                     ),
@@ -35587,7 +35611,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -35597,7 +35621,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -35636,7 +35660,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1997),
+                            constructor: DeclarationId(2000),
                             payload: vec![],
                         },
                     ),
@@ -35648,7 +35672,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -35658,7 +35682,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -35697,7 +35721,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1998),
+                            constructor: DeclarationId(2001),
                             payload: vec![],
                         },
                     ),
@@ -35709,7 +35733,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -35719,7 +35743,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -35758,7 +35782,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2000),
+                            constructor: DeclarationId(2003),
                             payload: vec![],
                         },
                     ),
@@ -37186,7 +37210,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1975),
+                            constructor: DeclarationId(1978),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1608),
                                 payload: vec![
@@ -37243,7 +37267,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1975),
+                            constructor: DeclarationId(1978),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1609),
                                 payload: vec![],
@@ -38699,7 +38723,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1989),
+                            constructor: DeclarationId(1992),
                             payload: vec![],
                         },
                     ),
@@ -38736,7 +38760,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1990),
+                            constructor: DeclarationId(1993),
                             payload: vec![],
                         },
                     ),
@@ -38747,7 +38771,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1980),
+                                    constructor: DeclarationId(1983),
                                     payload: vec![],
                                 },
                             ),
@@ -38785,7 +38809,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1991),
+                            constructor: DeclarationId(1994),
                             payload: vec![],
                         },
                     ),
@@ -38797,7 +38821,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1980),
+                                        constructor: DeclarationId(1983),
                                         payload: vec![],
                                     },
                                 ),
@@ -38807,7 +38831,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1980),
+                                        constructor: DeclarationId(1983),
                                         payload: vec![],
                                     },
                                 ),
@@ -38846,7 +38870,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1992),
+                            constructor: DeclarationId(1995),
                             payload: vec![],
                         },
                     ),
@@ -38858,7 +38882,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1980),
+                                        constructor: DeclarationId(1983),
                                         payload: vec![],
                                     },
                                 ),
@@ -38868,7 +38892,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1980),
+                                        constructor: DeclarationId(1983),
                                         payload: vec![],
                                     },
                                 ),
@@ -38907,7 +38931,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1993),
+                            constructor: DeclarationId(1996),
                             payload: vec![],
                         },
                     ),
@@ -38918,7 +38942,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1979),
+                                    constructor: DeclarationId(1982),
                                     payload: vec![],
                                 },
                             ),
@@ -38956,7 +38980,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1994),
+                            constructor: DeclarationId(1997),
                             payload: vec![],
                         },
                     ),
@@ -38967,7 +38991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1979),
+                                    constructor: DeclarationId(1982),
                                     payload: vec![],
                                 },
                             ),
@@ -39005,7 +39029,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1995),
+                            constructor: DeclarationId(1998),
                             payload: vec![],
                         },
                     ),
@@ -39017,7 +39041,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -39027,7 +39051,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1980),
+                                        constructor: DeclarationId(1983),
                                         payload: vec![],
                                     },
                                 ),
@@ -39037,7 +39061,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -39076,7 +39100,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1996),
+                            constructor: DeclarationId(1999),
                             payload: vec![],
                         },
                     ),
@@ -39088,7 +39112,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -39098,7 +39122,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -39137,7 +39161,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1997),
+                            constructor: DeclarationId(2000),
                             payload: vec![],
                         },
                     ),
@@ -39149,7 +39173,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -39159,7 +39183,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -39198,7 +39222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1998),
+                            constructor: DeclarationId(2001),
                             payload: vec![],
                         },
                     ),
@@ -39210,7 +39234,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -39220,7 +39244,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -39363,7 +39387,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2000),
+                            constructor: DeclarationId(2003),
                             payload: vec![],
                         },
                     ),
@@ -39876,7 +39900,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1975),
+                            constructor: DeclarationId(1978),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1608),
                                 payload: vec![
@@ -39933,7 +39957,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1975),
+                            constructor: DeclarationId(1978),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1608),
                                 payload: vec![
@@ -39990,7 +40014,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1977),
                             payload: vec![],
                         },
                     ),
@@ -40033,7 +40057,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1977),
                             payload: vec![],
                         },
                     ),
@@ -40076,7 +40100,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1977),
                             payload: vec![],
                         },
                     ),
@@ -40358,7 +40382,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1976),
+                                    constructor: DeclarationId(1979),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -40456,7 +40480,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1977),
+                                        constructor: DeclarationId(1980),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -40475,7 +40499,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1977),
+                                        constructor: DeclarationId(1980),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state_value".to_string(),
                                         ))],
@@ -40496,7 +40520,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -40557,7 +40581,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -40576,7 +40600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -40595,7 +40619,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -40886,7 +40910,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -40905,7 +40929,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -40968,7 +40992,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -40987,7 +41011,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -41050,7 +41074,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -41069,7 +41093,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -41131,7 +41155,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1976),
+                                    constructor: DeclarationId(1979),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -41193,7 +41217,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "0".to_string(),
                                         ))],
@@ -41212,7 +41236,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "1".to_string(),
                                         ))],
@@ -41273,7 +41297,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -41292,7 +41316,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -41353,7 +41377,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -41372,7 +41396,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -41391,7 +41415,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -41451,7 +41475,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1977),
+                                    constructor: DeclarationId(1980),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "index_of".to_string(),
                                     ))],
@@ -41511,7 +41535,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1977),
+                                        constructor: DeclarationId(1980),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -41530,7 +41554,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1977),
+                                        constructor: DeclarationId(1980),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -41590,7 +41614,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1977),
+                                    constructor: DeclarationId(1980),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -41649,7 +41673,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1976),
+                                    constructor: DeclarationId(1979),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -41708,7 +41732,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1976),
+                                    constructor: DeclarationId(1979),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -41768,7 +41792,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -41789,7 +41813,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -42002,7 +42026,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -42021,7 +42045,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -42042,7 +42066,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -42063,7 +42087,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -42084,7 +42108,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -42105,7 +42129,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -42126,7 +42150,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -42147,7 +42171,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -42168,7 +42192,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -42187,7 +42211,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -42478,7 +42502,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -42499,7 +42523,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -42560,7 +42584,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -42581,7 +42605,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1977),
+                                        constructor: DeclarationId(1980),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -42600,7 +42624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -42619,7 +42643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -42718,7 +42742,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -42737,7 +42761,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "data".to_string(),
                                         ))],
@@ -42758,7 +42782,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1977),
+                                        constructor: DeclarationId(1980),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -42777,7 +42801,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -42798,7 +42822,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1977),
+                                        constructor: DeclarationId(1980),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -42859,7 +42883,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -42878,7 +42902,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -42897,7 +42921,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -42918,7 +42942,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1977),
+                                        constructor: DeclarationId(1980),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -42937,7 +42961,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -42998,7 +43022,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -43017,7 +43041,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -43036,7 +43060,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -43057,7 +43081,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1977),
+                                        constructor: DeclarationId(1980),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -43076,7 +43100,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -43097,7 +43121,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1977),
+                                        constructor: DeclarationId(1980),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -43158,7 +43182,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -43177,7 +43201,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -43196,7 +43220,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -43215,7 +43239,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -43234,7 +43258,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -43255,7 +43279,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1977),
+                                        constructor: DeclarationId(1980),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -43274,7 +43298,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -43335,7 +43359,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -43354,7 +43378,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -43375,7 +43399,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1977),
+                                        constructor: DeclarationId(1980),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -43394,7 +43418,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -43413,7 +43437,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1976),
+                                        constructor: DeclarationId(1979),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -43434,7 +43458,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1977),
+                                        constructor: DeclarationId(1980),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -43455,7 +43479,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1977),
+                                        constructor: DeclarationId(1980),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -43556,7 +43580,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1977),
+                                        constructor: DeclarationId(1980),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -43575,7 +43599,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1977),
+                                        constructor: DeclarationId(1980),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -43594,7 +43618,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1977),
+                                        constructor: DeclarationId(1980),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -43615,7 +43639,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1977),
+                                        constructor: DeclarationId(1980),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -44708,7 +44732,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1989),
+                            constructor: DeclarationId(1992),
                             payload: vec![],
                         },
                     ),
@@ -44745,7 +44769,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1990),
+                            constructor: DeclarationId(1993),
                             payload: vec![],
                         },
                     ),
@@ -44756,7 +44780,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1980),
+                                    constructor: DeclarationId(1983),
                                     payload: vec![],
                                 },
                             ),
@@ -44794,7 +44818,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1991),
+                            constructor: DeclarationId(1994),
                             payload: vec![],
                         },
                     ),
@@ -44806,7 +44830,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1980),
+                                        constructor: DeclarationId(1983),
                                         payload: vec![],
                                     },
                                 ),
@@ -44816,7 +44840,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1980),
+                                        constructor: DeclarationId(1983),
                                         payload: vec![],
                                     },
                                 ),
@@ -44855,7 +44879,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1992),
+                            constructor: DeclarationId(1995),
                             payload: vec![],
                         },
                     ),
@@ -44867,7 +44891,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1980),
+                                        constructor: DeclarationId(1983),
                                         payload: vec![],
                                     },
                                 ),
@@ -44877,7 +44901,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1980),
+                                        constructor: DeclarationId(1983),
                                         payload: vec![],
                                     },
                                 ),
@@ -44916,7 +44940,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1993),
+                            constructor: DeclarationId(1996),
                             payload: vec![],
                         },
                     ),
@@ -44927,7 +44951,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1979),
+                                    constructor: DeclarationId(1982),
                                     payload: vec![],
                                 },
                             ),
@@ -45101,7 +45125,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1994),
+                            constructor: DeclarationId(1997),
                             payload: vec![],
                         },
                     ),
@@ -45112,7 +45136,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1979),
+                                    constructor: DeclarationId(1982),
                                     payload: vec![],
                                 },
                             ),
@@ -45150,7 +45174,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1995),
+                            constructor: DeclarationId(1998),
                             payload: vec![],
                         },
                     ),
@@ -45162,7 +45186,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -45172,7 +45196,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1980),
+                                        constructor: DeclarationId(1983),
                                         payload: vec![],
                                     },
                                 ),
@@ -45182,7 +45206,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -45221,7 +45245,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1996),
+                            constructor: DeclarationId(1999),
                             payload: vec![],
                         },
                     ),
@@ -45233,7 +45257,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -45243,7 +45267,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -45282,7 +45306,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1997),
+                            constructor: DeclarationId(2000),
                             payload: vec![],
                         },
                     ),
@@ -45294,7 +45318,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -45304,7 +45328,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -45343,7 +45367,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1998),
+                            constructor: DeclarationId(2001),
                             payload: vec![],
                         },
                     ),
@@ -45355,7 +45379,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -45365,7 +45389,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1979),
+                                        constructor: DeclarationId(1982),
                                         payload: vec![],
                                     },
                                 ),
@@ -45404,7 +45428,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2000),
+                            constructor: DeclarationId(2003),
                             payload: vec![],
                         },
                     ),
@@ -45845,7 +45869,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{ let mut __left = {left}; __left.extend({right}); __left }"
                                     .to_string(),
@@ -45859,7 +45883,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -45899,7 +45923,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).len() as i64".to_string(),
                             ))],
@@ -45912,7 +45936,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -45950,7 +45974,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).is_empty()".to_string(),
                             ))],
@@ -45963,7 +45987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -46003,7 +46027,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2010),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().fold({init}, {body})".to_string(),
                             ))],
@@ -46016,7 +46040,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2009),
                             payload: vec![],
                         },
                     ),
@@ -46088,14 +46112,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "read".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2001),
+                            constructor: DeclarationId(2004),
                             payload: vec![],
                         },
                     ),
                     (
                         "construct".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2003),
+                            constructor: DeclarationId(2006),
                             payload: vec![],
                         },
                     ),
@@ -46746,15 +46770,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SnapshotSurface".to_string(),
-                        ty: DeclarationId(2232),
+                        ty: DeclarationId(2238),
                     },
                     Field {
                         label: "SnapshotDag".to_string(),
-                        ty: DeclarationId(2233),
+                        ty: DeclarationId(2239),
                     },
                     Field {
                         label: "SnapshotText".to_string(),
-                        ty: DeclarationId(2234),
+                        ty: DeclarationId(2240),
                     },
                 ],
             },
@@ -46970,7 +46994,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2232),
+                            constructor: DeclarationId(2238),
                             payload: vec![],
                         },
                     ),
@@ -47005,7 +47029,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2233),
+                            constructor: DeclarationId(2239),
                             payload: vec![],
                         },
                     ),
@@ -47040,7 +47064,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2233),
+                            constructor: DeclarationId(2239),
                             payload: vec![],
                         },
                     ),
@@ -47075,7 +47099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2233),
+                            constructor: DeclarationId(2239),
                             payload: vec![],
                         },
                     ),
@@ -47110,7 +47134,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2233),
+                            constructor: DeclarationId(2239),
                             payload: vec![],
                         },
                     ),
@@ -47145,7 +47169,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2234),
+                            constructor: DeclarationId(2240),
                             payload: vec![],
                         },
                     ),
@@ -47295,7 +47319,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("from_symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(2235),
+                output: DeclarationId(2241),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/operators.dag",
                     156,
@@ -47711,11 +47735,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "OrderedRingAlgebra".to_string(),
-                        ty: DeclarationId(2236),
+                        ty: DeclarationId(2242),
                     },
                     Field {
                         label: "SemiringAlgebra".to_string(),
-                        ty: DeclarationId(2237),
+                        ty: DeclarationId(2243),
                     },
                 ],
             },
@@ -47736,11 +47760,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "BooleanAlgebraAlgebra".to_string(),
-                        ty: DeclarationId(2238),
+                        ty: DeclarationId(2244),
                     },
                     Field {
                         label: "TerminalAlgebra".to_string(),
-                        ty: DeclarationId(2239),
+                        ty: DeclarationId(2245),
                     },
                 ],
             },
@@ -47761,31 +47785,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "BitCarrier".to_string(),
-                        ty: DeclarationId(2240),
+                        ty: DeclarationId(2246),
                     },
                     Field {
                         label: "ByteCarrier".to_string(),
-                        ty: DeclarationId(2241),
+                        ty: DeclarationId(2247),
                     },
                     Field {
                         label: "Word16Carrier".to_string(),
-                        ty: DeclarationId(2242),
+                        ty: DeclarationId(2248),
                     },
                     Field {
                         label: "Word32Carrier".to_string(),
-                        ty: DeclarationId(2243),
+                        ty: DeclarationId(2249),
                     },
                     Field {
                         label: "Word64Carrier".to_string(),
-                        ty: DeclarationId(2244),
+                        ty: DeclarationId(2250),
                     },
                     Field {
                         label: "Word128Carrier".to_string(),
-                        ty: DeclarationId(2245),
+                        ty: DeclarationId(2251),
                     },
                     Field {
                         label: "TerminalCarrier".to_string(),
-                        ty: DeclarationId(2246),
+                        ty: DeclarationId(2252),
                     },
                 ],
             },
@@ -47806,15 +47830,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TwoComplementWrap".to_string(),
-                        ty: DeclarationId(2247),
+                        ty: DeclarationId(2253),
                     },
                     Field {
                         label: "Saturating".to_string(),
-                        ty: DeclarationId(2248),
+                        ty: DeclarationId(2254),
                     },
                     Field {
                         label: "Trap".to_string(),
-                        ty: DeclarationId(2249),
+                        ty: DeclarationId(2255),
                     },
                 ],
             },
@@ -47835,11 +47859,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IntegerPrimitive".to_string(),
-                        ty: DeclarationId(2250),
+                        ty: DeclarationId(2256),
                     },
                     Field {
                         label: "NonIntegerPrimitive".to_string(),
-                        ty: DeclarationId(2251),
+                        ty: DeclarationId(2257),
                     },
                 ],
             },
@@ -47865,83 +47889,83 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2252)),
+            meta_tag: Some(DeclarationId(2258)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
                 FieldValue::Variant {
-                    constructor: DeclarationId(2250),
+                    constructor: DeclarationId(2256),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2236),
+                            constructor: DeclarationId(2242),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2241),
+                            constructor: DeclarationId(2247),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("-128".to_string())),
                         FieldValue::Literal(LiteralBits::String("127".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2247),
+                            constructor: DeclarationId(2253),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2250),
+                    constructor: DeclarationId(2256),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2236),
+                            constructor: DeclarationId(2242),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2242),
+                            constructor: DeclarationId(2248),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("-32768".to_string())),
                         FieldValue::Literal(LiteralBits::String("32767".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2247),
+                            constructor: DeclarationId(2253),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2250),
+                    constructor: DeclarationId(2256),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2236),
+                            constructor: DeclarationId(2242),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2243),
+                            constructor: DeclarationId(2249),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("-2147483648".to_string())),
                         FieldValue::Literal(LiteralBits::String("2147483647".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2247),
+                            constructor: DeclarationId(2253),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2250),
+                    constructor: DeclarationId(2256),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2236),
+                            constructor: DeclarationId(2242),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2244),
+                            constructor: DeclarationId(2250),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -47950,21 +47974,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2247),
+                            constructor: DeclarationId(2253),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2250),
+                    constructor: DeclarationId(2256),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2236),
+                            constructor: DeclarationId(2242),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2245),
+                            constructor: DeclarationId(2251),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -47975,84 +47999,84 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2247),
+                            constructor: DeclarationId(2253),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2250),
+                    constructor: DeclarationId(2256),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2237),
+                            constructor: DeclarationId(2243),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2241),
+                            constructor: DeclarationId(2247),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("255".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2247),
+                            constructor: DeclarationId(2253),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2250),
+                    constructor: DeclarationId(2256),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2237),
+                            constructor: DeclarationId(2243),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2242),
+                            constructor: DeclarationId(2248),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("65535".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2247),
+                            constructor: DeclarationId(2253),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2250),
+                    constructor: DeclarationId(2256),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2237),
+                            constructor: DeclarationId(2243),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2243),
+                            constructor: DeclarationId(2249),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("4294967295".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2247),
+                            constructor: DeclarationId(2253),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2250),
+                    constructor: DeclarationId(2256),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2237),
+                            constructor: DeclarationId(2243),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2244),
+                            constructor: DeclarationId(2250),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -48061,36 +48085,36 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2247),
+                            constructor: DeclarationId(2253),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2251),
+                    constructor: DeclarationId(2257),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("bool".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2238),
+                            constructor: DeclarationId(2244),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2240),
+                            constructor: DeclarationId(2246),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2251),
+                    constructor: DeclarationId(2257),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("()".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2239),
+                            constructor: DeclarationId(2245),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2246),
+                            constructor: DeclarationId(2252),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -56232,7 +56256,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1073, 1085),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1073, 1086),
         });
         declarations.push(Declaration {
             id: DeclarationId(1929),
@@ -56246,7 +56270,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1090, 1103),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1091, 1103),
         });
         declarations.push(Declaration {
             id: DeclarationId(1930),
@@ -56274,11 +56298,53 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1125, 1148),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1125, 1147),
         });
         declarations.push(Declaration {
             id: DeclarationId(1932),
             name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1152, 1171),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1933),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1176, 1201),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1934),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 1206, 1229),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1935),
+            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -56293,10 +56359,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5348, 5384),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5429, 5465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1933),
+            id: DeclarationId(1936),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56312,10 +56378,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5389, 5430),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5470, 5511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1934),
+            id: DeclarationId(1937),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -56332,10 +56398,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5889, 5905),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 5970, 5986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1935),
+            id: DeclarationId(1938),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56351,10 +56417,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9017, 9058),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9098, 9139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1936),
+            id: DeclarationId(1939),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56365,10 +56431,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9355, 9367),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9436, 9448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1937),
+            id: DeclarationId(1940),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -56385,10 +56451,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9637, 9649),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9718, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1938),
+            id: DeclarationId(1941),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56398,7 +56464,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "sites".to_string(),
-                        ty: DeclarationId(1937),
+                        ty: DeclarationId(1940),
                     },
                 ],
             },
@@ -56410,10 +56476,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9594, 9651),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9675, 9732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1939),
+            id: DeclarationId(1942),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56429,10 +56495,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 9961, 9995),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10042, 10076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1940),
+            id: DeclarationId(1943),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56448,10 +56514,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10398, 10449),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10479, 10530),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1941),
+            id: DeclarationId(1944),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56462,10 +56528,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10792, 10810),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 10873, 10891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1942),
+            id: DeclarationId(1945),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56491,10 +56557,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/diagnostics.dag", 11160, 11258),
+            span: SourceSpan::new("src/v3/std/diagnostics.dag", 11241, 11339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1943),
+            id: DeclarationId(1946),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -56514,7 +56580,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4846, 4866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1944),
+            id: DeclarationId(1947),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(887),
@@ -56540,7 +56606,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4876, 4900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1945),
+            id: DeclarationId(1948),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(887),
@@ -56566,7 +56632,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4911, 4935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1946),
+            id: DeclarationId(1949),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(887),
@@ -56592,7 +56658,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4941, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1947),
+            id: DeclarationId(1950),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -56612,7 +56678,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5042, 5062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1948),
+            id: DeclarationId(1951),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(887),
@@ -56638,7 +56704,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5072, 5096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1949),
+            id: DeclarationId(1952),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(887),
@@ -56664,7 +56730,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5107, 5131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1950),
+            id: DeclarationId(1953),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(887),
@@ -56690,7 +56756,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5137, 5161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1951),
+            id: DeclarationId(1954),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -56710,7 +56776,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5245, 5265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1952),
+            id: DeclarationId(1955),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(887),
@@ -56736,7 +56802,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5276, 5300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1953),
+            id: DeclarationId(1956),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(887),
@@ -56762,7 +56828,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5325, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1954),
+            id: DeclarationId(1957),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -56782,7 +56848,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5440, 5460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1955),
+            id: DeclarationId(1958),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(887),
@@ -56808,7 +56874,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5471, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1956),
+            id: DeclarationId(1959),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(887),
@@ -56834,7 +56900,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5520, 5544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1957),
+            id: DeclarationId(1960),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56853,7 +56919,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1634, 1651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1958),
+            id: DeclarationId(1961),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56878,7 +56944,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1656, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1959),
+            id: DeclarationId(1962),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56892,7 +56958,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1879, 1891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1960),
+            id: DeclarationId(1963),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56911,7 +56977,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1896, 1932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1961),
+            id: DeclarationId(1964),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(880),
@@ -56931,13 +56997,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2414, 2430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1962),
+            id: DeclarationId(1965),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(608),
-                    value: DeclarationId(1961),
+                    value: DeclarationId(1964),
                 }],
             },
             type_params: vec![],
@@ -56951,7 +57017,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2409, 2431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1963),
+            id: DeclarationId(1966),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56965,7 +57031,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1962),
+                        ty: DeclarationId(1965),
                     },
                 ],
             },
@@ -56980,7 +57046,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2325, 2437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1964),
+            id: DeclarationId(1967),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -57000,7 +57066,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2505, 2521),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1965),
+            id: DeclarationId(1968),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(880),
@@ -57020,13 +57086,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2544, 2560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1966),
+            id: DeclarationId(1969),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(608),
-                    value: DeclarationId(1965),
+                    value: DeclarationId(1968),
                 }],
             },
             type_params: vec![],
@@ -57040,7 +57106,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2539, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1967),
+            id: DeclarationId(1970),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57050,11 +57116,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "violations".to_string(),
-                        ty: DeclarationId(1964),
+                        ty: DeclarationId(1967),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1966),
+                        ty: DeclarationId(1969),
                     },
                 ],
             },
@@ -57069,7 +57135,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2442, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1968),
+            id: DeclarationId(1971),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(880),
@@ -57089,11 +57155,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3902, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1969),
+            id: DeclarationId(1972),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(748), DeclarationId(747)],
-                output: DeclarationId(1968),
+                output: DeclarationId(1971),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -57107,7 +57173,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3881, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1970),
+            id: DeclarationId(1973),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -57127,7 +57193,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3930, 3945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1971),
+            id: DeclarationId(1974),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747), DeclarationId(886)],
@@ -57145,7 +57211,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3966, 4009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1972),
+            id: DeclarationId(1975),
             name: Some("DimensionUnitAbelianGroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(25),
@@ -57165,7 +57231,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1973),
+            id: DeclarationId(1976),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -57185,7 +57251,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1974),
+            id: DeclarationId(1977),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57199,7 +57265,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4188, 4204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1975),
+            id: DeclarationId(1978),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57218,7 +57284,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4209, 4237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1976),
+            id: DeclarationId(1979),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57237,7 +57303,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4727, 4746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1977),
+            id: DeclarationId(1980),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57256,7 +57322,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4751, 4773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1978),
+            id: DeclarationId(1981),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -57276,7 +57342,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5142, 5165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1979),
+            id: DeclarationId(1982),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57290,7 +57356,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6162, 6170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1980),
+            id: DeclarationId(1983),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57304,7 +57370,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6175, 6183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1981),
+            id: DeclarationId(1984),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57318,7 +57384,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1982),
+            id: DeclarationId(1985),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57332,7 +57398,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6634, 6642),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1983),
+            id: DeclarationId(1986),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57346,7 +57412,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6978, 6991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1984),
+            id: DeclarationId(1987),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57360,7 +57426,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6996, 7002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1985),
+            id: DeclarationId(1988),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57374,7 +57440,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7260, 7268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1986),
+            id: DeclarationId(1989),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57388,7 +57454,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7273, 7278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1987),
+            id: DeclarationId(1990),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57402,7 +57468,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7283, 7296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1988),
+            id: DeclarationId(1991),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57416,7 +57482,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7633, 7651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1989),
+            id: DeclarationId(1992),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57430,7 +57496,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9026, 9035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1990),
+            id: DeclarationId(1993),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57444,7 +57510,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9040, 9053),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1991),
+            id: DeclarationId(1994),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57458,7 +57524,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9058, 9066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1992),
+            id: DeclarationId(1995),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57472,7 +57538,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9071, 9081),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1993),
+            id: DeclarationId(1996),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57486,7 +57552,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9086, 9096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1994),
+            id: DeclarationId(1997),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57500,7 +57566,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9101, 9112),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1995),
+            id: DeclarationId(1998),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57514,7 +57580,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9117, 9125),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1996),
+            id: DeclarationId(1999),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57528,7 +57594,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9130, 9137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1997),
+            id: DeclarationId(2000),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57542,7 +57608,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9142, 9152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1998),
+            id: DeclarationId(2001),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57556,7 +57622,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9157, 9169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1999),
+            id: DeclarationId(2002),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57570,7 +57636,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11862, 11888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2000),
+            id: DeclarationId(2003),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57584,7 +57650,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11893, 11903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2001),
+            id: DeclarationId(2004),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57598,7 +57664,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16115, 16121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2002),
+            id: DeclarationId(2005),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57612,7 +57678,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16126, 16137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2003),
+            id: DeclarationId(2006),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57626,7 +57692,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16457, 16468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2004),
+            id: DeclarationId(2007),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57640,7 +57706,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16473, 16484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2005),
+            id: DeclarationId(2008),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57654,7 +57720,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 18417, 18428),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2006),
+            id: DeclarationId(2009),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57668,7 +57734,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 18433, 18441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2007),
+            id: DeclarationId(2010),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57687,7 +57753,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19604, 19639),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2008),
+            id: DeclarationId(2011),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57712,7 +57778,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19644, 19732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2009),
+            id: DeclarationId(2012),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -57732,7 +57798,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 4881, 4909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2010),
+            id: DeclarationId(2013),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(848),
@@ -57749,7 +57815,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20505, 20517),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2011),
+            id: DeclarationId(2014),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(851),
@@ -57766,7 +57832,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21890, 21905),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2012),
+            id: DeclarationId(2015),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -57786,7 +57852,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27797, 27812),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2013),
+            id: DeclarationId(2016),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -57803,7 +57869,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 31950, 31954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2014),
+            id: DeclarationId(2017),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -57820,7 +57886,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 32246, 32250),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2015),
+            id: DeclarationId(2018),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -57837,7 +57903,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33495, 33499),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2016),
+            id: DeclarationId(2019),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -57854,7 +57920,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33970, 33974),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2017),
+            id: DeclarationId(2020),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -57871,7 +57937,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35233, 35237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2018),
+            id: DeclarationId(2021),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(81),
@@ -57888,7 +57954,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35505, 35509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2019),
+            id: DeclarationId(2022),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57902,7 +57968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5562, 5577),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2020),
+            id: DeclarationId(2023),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57916,7 +57982,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5617, 5630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2021),
+            id: DeclarationId(2024),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57930,7 +57996,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5678, 5695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2022),
+            id: DeclarationId(2025),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57944,7 +58010,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5734, 5746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2023),
+            id: DeclarationId(2026),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57958,7 +58024,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5794, 5811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2024),
+            id: DeclarationId(2027),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57983,7 +58049,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 9904, 9966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2025),
+            id: DeclarationId(2028),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58002,7 +58068,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10013),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2026),
+            id: DeclarationId(2029),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58027,7 +58093,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10018, 10075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2027),
+            id: DeclarationId(2030),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58041,7 +58107,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10080, 10094),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2028),
+            id: DeclarationId(2031),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58055,7 +58121,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10099, 10114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2029),
+            id: DeclarationId(2032),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58069,7 +58135,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24082, 24096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2030),
+            id: DeclarationId(2033),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58088,7 +58154,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24101, 24148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2031),
+            id: DeclarationId(2034),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58113,7 +58179,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24153, 24230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2032),
+            id: DeclarationId(2035),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58138,7 +58204,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24235, 24309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2033),
+            id: DeclarationId(2036),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58163,7 +58229,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24929, 24985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2034),
+            id: DeclarationId(2037),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58182,7 +58248,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 25001, 25026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2035),
+            id: DeclarationId(2038),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58196,7 +58262,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26675, 26688),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2036),
+            id: DeclarationId(2039),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58215,7 +58281,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26732, 26764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2037),
+            id: DeclarationId(2040),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -58235,12 +58301,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26827, 26843),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2038),
+            id: DeclarationId(2041),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "factors".to_string(),
-                    ty: DeclarationId(2037),
+                    ty: DeclarationId(2040),
                 }],
             },
             type_params: vec![],
@@ -58254,7 +58320,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26803, 26845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2039),
+            id: DeclarationId(2042),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -58274,13 +58340,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26907, 26923),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2040),
+            id: DeclarationId(2043),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(608),
-                    value: DeclarationId(2039),
+                    value: DeclarationId(2042),
                 }],
             },
             type_params: vec![],
@@ -58294,12 +58360,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26902, 26924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2041),
+            id: DeclarationId(2044),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2040),
+                    ty: DeclarationId(2043),
                 }],
             },
             type_params: vec![],
@@ -58313,7 +58379,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26874, 26926),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2042),
+            id: DeclarationId(2045),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -58333,12 +58399,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27224, 27239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2043),
+            id: DeclarationId(2046),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2042),
+                    ty: DeclarationId(2045),
                 }],
             },
             type_params: vec![],
@@ -58352,7 +58418,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27206, 27241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2044),
+            id: DeclarationId(2047),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58366,7 +58432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27324, 27336),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2045),
+            id: DeclarationId(2048),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58380,7 +58446,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27406, 27416),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2046),
+            id: DeclarationId(2049),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -58400,7 +58466,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1234, 1254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2047),
+            id: DeclarationId(2050),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -58420,7 +58486,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1414, 1434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2048),
+            id: DeclarationId(2051),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(880),
@@ -58440,11 +58506,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2049),
+            id: DeclarationId(2052),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(748), DeclarationId(747)],
-                output: DeclarationId(2048),
+                output: DeclarationId(2051),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -58458,7 +58524,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2050),
+            id: DeclarationId(2053),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -58478,7 +58544,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2051),
+            id: DeclarationId(2054),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1012), DeclarationId(1012)],
@@ -58496,7 +58562,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2052),
+            id: DeclarationId(2055),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1012), DeclarationId(738)],
@@ -58514,7 +58580,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2053),
+            id: DeclarationId(2056),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(748), DeclarationId(1012)],
@@ -58532,7 +58598,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2054),
+            id: DeclarationId(2057),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1013),
@@ -58552,7 +58618,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4577, 4588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2055),
+            id: DeclarationId(2058),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1013),
@@ -58572,7 +58638,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4630, 4641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2056),
+            id: DeclarationId(2059),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58586,7 +58652,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4532, 4536),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2057),
+            id: DeclarationId(2060),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58605,7 +58671,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4541, 4551),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2058),
+            id: DeclarationId(2061),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -58629,7 +58695,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2059),
+            id: DeclarationId(2062),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58648,7 +58714,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2132, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2060),
+            id: DeclarationId(2063),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -58668,12 +58734,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2174, 2190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2061),
+            id: DeclarationId(2064),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2060),
+                    ty: DeclarationId(2063),
                 }],
             },
             type_params: vec![],
@@ -58687,7 +58753,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2162, 2191),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2062),
+            id: DeclarationId(2065),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58712,7 +58778,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2196, 2247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2063),
+            id: DeclarationId(2066),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58731,7 +58797,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2252, 2267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2064),
+            id: DeclarationId(2067),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58750,7 +58816,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2272, 2299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2065),
+            id: DeclarationId(2068),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -58776,7 +58842,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 3931, 3949),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2066),
+            id: DeclarationId(2069),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -58796,7 +58862,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 4537, 4552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2067),
+            id: DeclarationId(2070),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58815,7 +58881,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5405, 5459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2068),
+            id: DeclarationId(2071),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58829,7 +58895,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5724, 5733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2069),
+            id: DeclarationId(2072),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -58849,7 +58915,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3589, 3617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2070),
+            id: DeclarationId(2073),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -58875,7 +58941,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/services.dag", 6838, 6861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2071),
+            id: DeclarationId(2074),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1039),
@@ -58892,7 +58958,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2329, 2345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2072),
+            id: DeclarationId(2075),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1039),
@@ -58909,7 +58975,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2350, 2366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2073),
+            id: DeclarationId(2076),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1039),
@@ -58926,7 +58992,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2371, 2387),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2074),
+            id: DeclarationId(2077),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -58952,7 +59018,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2632, 2660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2075),
+            id: DeclarationId(2078),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -58978,7 +59044,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2704, 2732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2076),
+            id: DeclarationId(2079),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1047),
@@ -58995,7 +59061,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5879, 5901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2077),
+            id: DeclarationId(2080),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1048),
@@ -59012,7 +59078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6321, 6341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2078),
+            id: DeclarationId(2081),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59026,7 +59092,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 667, 673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2079),
+            id: DeclarationId(2082),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59040,7 +59106,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 678, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2080),
+            id: DeclarationId(2083),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59054,7 +59120,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 696, 710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2081),
+            id: DeclarationId(2084),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59073,7 +59139,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3232, 3258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2082),
+            id: DeclarationId(2085),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59092,7 +59158,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3263, 3291),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2083),
+            id: DeclarationId(2086),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59111,7 +59177,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3296, 3329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2084),
+            id: DeclarationId(2087),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59130,7 +59196,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3334, 3365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2085),
+            id: DeclarationId(2088),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59149,7 +59215,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3370, 3402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2086),
+            id: DeclarationId(2089),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59163,7 +59229,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4409, 4416),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2087),
+            id: DeclarationId(2090),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59182,7 +59248,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4421, 4471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2088),
+            id: DeclarationId(2091),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59196,7 +59262,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4966, 4977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2089),
+            id: DeclarationId(2092),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59215,7 +59281,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4982, 5027),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2090),
+            id: DeclarationId(2093),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59234,7 +59300,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7131, 7165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2091),
+            id: DeclarationId(2094),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59253,7 +59319,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7170, 7214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2092),
+            id: DeclarationId(2095),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59272,7 +59338,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7219, 7277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2093),
+            id: DeclarationId(2096),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59291,7 +59357,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7282, 7338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2094),
+            id: DeclarationId(2097),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59310,7 +59376,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7343, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2095),
+            id: DeclarationId(2098),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59329,7 +59395,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7381, 7411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2096),
+            id: DeclarationId(2099),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59343,7 +59409,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7416, 7429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2097),
+            id: DeclarationId(2100),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -59363,7 +59429,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7469, 7491),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2098),
+            id: DeclarationId(2101),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -59383,7 +59449,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7701, 7722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2099),
+            id: DeclarationId(2102),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59397,7 +59463,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2100),
+            id: DeclarationId(2103),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59411,7 +59477,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2101),
+            id: DeclarationId(2104),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59425,7 +59491,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2102),
+            id: DeclarationId(2105),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59439,7 +59505,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2103),
+            id: DeclarationId(2106),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59453,7 +59519,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2104),
+            id: DeclarationId(2107),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59467,7 +59533,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2105),
+            id: DeclarationId(2108),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59481,7 +59547,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2106),
+            id: DeclarationId(2109),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59495,7 +59561,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2107),
+            id: DeclarationId(2110),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59509,7 +59575,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2108),
+            id: DeclarationId(2111),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59523,7 +59589,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2109),
+            id: DeclarationId(2112),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59537,7 +59603,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2110),
+            id: DeclarationId(2113),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59551,7 +59617,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 768, 774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2111),
+            id: DeclarationId(2114),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59565,7 +59631,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 779, 786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2112),
+            id: DeclarationId(2115),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59584,7 +59650,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 791, 804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2113),
+            id: DeclarationId(2116),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59603,7 +59669,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 809, 820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2114),
+            id: DeclarationId(2117),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59622,7 +59688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 825, 842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2115),
+            id: DeclarationId(2118),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59636,7 +59702,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 847, 849),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2116),
+            id: DeclarationId(2119),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59650,7 +59716,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 854, 858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2117),
+            id: DeclarationId(2120),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59664,7 +59730,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 863, 868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2118),
+            id: DeclarationId(2121),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59678,7 +59744,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 873, 875),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2119),
+            id: DeclarationId(2122),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59692,7 +59758,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 880, 882),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2120),
+            id: DeclarationId(2123),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59706,7 +59772,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 887, 889),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2121),
+            id: DeclarationId(2124),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59720,7 +59786,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 894, 896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2122),
+            id: DeclarationId(2125),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59734,7 +59800,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 901, 905),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2123),
+            id: DeclarationId(2126),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59748,7 +59814,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 910, 915),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2124),
+            id: DeclarationId(2127),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59762,7 +59828,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 920, 924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2125),
+            id: DeclarationId(2128),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59776,7 +59842,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 929, 934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2126),
+            id: DeclarationId(2129),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59790,7 +59856,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 939, 945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2127),
+            id: DeclarationId(2130),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59804,7 +59870,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 950, 958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2128),
+            id: DeclarationId(2131),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59818,7 +59884,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 963, 968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2129),
+            id: DeclarationId(2132),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59832,7 +59898,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 973, 978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2130),
+            id: DeclarationId(2133),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59846,7 +59912,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 983, 991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2131),
+            id: DeclarationId(2134),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59860,7 +59926,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 996, 1005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2132),
+            id: DeclarationId(2135),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59874,7 +59940,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1010, 1013),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2133),
+            id: DeclarationId(2136),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59888,7 +59954,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1018, 1024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2134),
+            id: DeclarationId(2137),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59902,7 +59968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1029, 1035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2135),
+            id: DeclarationId(2138),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59916,7 +59982,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1040, 1046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2136),
+            id: DeclarationId(2139),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59930,7 +59996,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1051, 1057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2137),
+            id: DeclarationId(2140),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59944,7 +60010,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1062, 1070),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2138),
+            id: DeclarationId(2141),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59958,7 +60024,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1075, 1083),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2139),
+            id: DeclarationId(2142),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59972,7 +60038,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1088, 1093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2140),
+            id: DeclarationId(2143),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59986,7 +60052,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1098, 1107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2141),
+            id: DeclarationId(2144),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60000,7 +60066,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1116),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2142),
+            id: DeclarationId(2145),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60014,7 +60080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1121, 1129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2143),
+            id: DeclarationId(2146),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60028,7 +60094,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1134, 1137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2144),
+            id: DeclarationId(2147),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60042,7 +60108,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1708, 1713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2145),
+            id: DeclarationId(2148),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60056,7 +60122,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1718, 1722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2146),
+            id: DeclarationId(2149),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60070,7 +60136,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1727, 1733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2147),
+            id: DeclarationId(2150),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60084,7 +60150,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1738, 1744),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2148),
+            id: DeclarationId(2151),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60098,7 +60164,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1749, 1753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2149),
+            id: DeclarationId(2152),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60112,7 +60178,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1758, 1764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2150),
+            id: DeclarationId(2153),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60126,7 +60192,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1769, 1777),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2151),
+            id: DeclarationId(2154),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60140,7 +60206,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1782, 1790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2152),
+            id: DeclarationId(2155),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60154,7 +60220,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1795, 1802),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2153),
+            id: DeclarationId(2156),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60168,7 +60234,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1807, 1813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2154),
+            id: DeclarationId(2157),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60182,7 +60248,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1818, 1825),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2155),
+            id: DeclarationId(2158),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60196,7 +60262,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1830, 1836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2156),
+            id: DeclarationId(2159),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60210,7 +60276,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1841, 1848),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2157),
+            id: DeclarationId(2160),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60224,7 +60290,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2288, 2290),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2158),
+            id: DeclarationId(2161),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60238,7 +60304,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2295, 2299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2159),
+            id: DeclarationId(2162),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60252,7 +60318,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2304, 2309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2160),
+            id: DeclarationId(2163),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60266,7 +60332,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2314, 2316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2161),
+            id: DeclarationId(2164),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60280,7 +60346,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2321, 2323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2162),
+            id: DeclarationId(2165),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60294,7 +60360,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2328, 2330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2163),
+            id: DeclarationId(2166),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60308,7 +60374,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2335, 2337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2164),
+            id: DeclarationId(2167),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60322,7 +60388,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2342, 2346),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2165),
+            id: DeclarationId(2168),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60336,7 +60402,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2351, 2356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2166),
+            id: DeclarationId(2169),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60350,7 +60416,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2361, 2365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2167),
+            id: DeclarationId(2170),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60364,7 +60430,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2370, 2375),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2168),
+            id: DeclarationId(2171),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60378,7 +60444,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2380, 2386),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2169),
+            id: DeclarationId(2172),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60392,7 +60458,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2391, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2170),
+            id: DeclarationId(2173),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60406,7 +60472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2404, 2409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2171),
+            id: DeclarationId(2174),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60420,7 +60486,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2414, 2419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2172),
+            id: DeclarationId(2175),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60434,7 +60500,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2424, 2432),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2173),
+            id: DeclarationId(2176),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60448,7 +60514,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2437, 2446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2174),
+            id: DeclarationId(2177),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60462,7 +60528,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2451, 2454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2175),
+            id: DeclarationId(2178),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60476,7 +60542,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2459, 2465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2176),
+            id: DeclarationId(2179),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60490,7 +60556,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2470, 2476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2177),
+            id: DeclarationId(2180),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60504,7 +60570,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2481, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2178),
+            id: DeclarationId(2181),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60518,7 +60584,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2492, 2498),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2179),
+            id: DeclarationId(2182),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60532,7 +60598,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2503, 2511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2180),
+            id: DeclarationId(2183),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60546,7 +60612,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2516, 2524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2181),
+            id: DeclarationId(2184),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60560,7 +60626,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2529, 2534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2182),
+            id: DeclarationId(2185),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60574,7 +60640,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2539, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2183),
+            id: DeclarationId(2186),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60588,7 +60654,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2553, 2557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2184),
+            id: DeclarationId(2187),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60602,7 +60668,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2562, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2185),
+            id: DeclarationId(2188),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60619,10 +60685,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16747, 16770),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16828, 16851),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2186),
+            id: DeclarationId(2189),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60639,10 +60705,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16972, 16987),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17053, 17068),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2187),
+            id: DeclarationId(2190),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -60659,10 +60725,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16992, 17012),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17073, 17093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2188),
+            id: DeclarationId(2191),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60676,7 +60742,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2480, 2494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2189),
+            id: DeclarationId(2192),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60690,7 +60756,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2499, 2509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2190),
+            id: DeclarationId(2193),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60704,7 +60770,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2514, 2526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2191),
+            id: DeclarationId(2194),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60715,10 +60781,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2531, 2543),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2531, 2544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2192),
+            id: DeclarationId(2195),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60729,10 +60795,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2548, 2561),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2549, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2193),
+            id: DeclarationId(2196),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60746,7 +60812,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2566, 2578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2194),
+            id: DeclarationId(2197),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60757,10 +60823,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2583, 2606),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2583, 2605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2195),
+            id: DeclarationId(2198),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60771,10 +60837,52 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3012, 3021),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2610, 2629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2196),
+            id: DeclarationId(2199),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/verification.dag", 2634, 2659),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2200),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/verification.dag", 2664, 2687),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2201),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/verification.dag", 3093, 3102),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2202),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60790,10 +60898,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3026, 3042),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3107, 3123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2197),
+            id: DeclarationId(2203),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60804,10 +60912,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3701, 3709),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3782, 3790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2198),
+            id: DeclarationId(2204),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60818,10 +60926,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3714, 3724),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3795, 3805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2199),
+            id: DeclarationId(2205),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60832,10 +60940,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4539, 4552),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4620, 4633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2200),
+            id: DeclarationId(2206),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60846,10 +60954,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4557, 4570),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4638, 4651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2201),
+            id: DeclarationId(2207),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60860,10 +60968,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4575, 4583),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4656, 4664),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2202),
+            id: DeclarationId(2208),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60874,10 +60982,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4608, 4616),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4689, 4697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2203),
+            id: DeclarationId(2209),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60893,10 +61001,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4621, 4661),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4702, 4742),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2204),
+            id: DeclarationId(2210),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60912,10 +61020,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4666, 4699),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4747, 4780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2205),
+            id: DeclarationId(2211),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60937,10 +61045,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4704, 4782),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4785, 4863),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2206),
+            id: DeclarationId(2212),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60956,10 +61064,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4948, 5011),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5029, 5092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2207),
+            id: DeclarationId(2213),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60985,10 +61093,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5016, 5107),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5097, 5188),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2208),
+            id: DeclarationId(2214),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61014,10 +61122,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5112, 5244),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5193, 5325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2209),
+            id: DeclarationId(2215),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61039,10 +61147,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5459, 5548),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5540, 5629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2210),
+            id: DeclarationId(2216),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61059,10 +61167,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6348, 6360),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6429, 6441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2211),
+            id: DeclarationId(2217),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61072,7 +61180,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2210),
+                        ty: DeclarationId(2216),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -61088,10 +61196,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6297, 6394),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6378, 6475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2212),
+            id: DeclarationId(2218),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61108,10 +61216,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 7094, 7106),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7175, 7187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2213),
+            id: DeclarationId(2219),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61121,7 +61229,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2212),
+                        ty: DeclarationId(2218),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -61137,10 +61245,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 7044, 7140),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7125, 7221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2214),
+            id: DeclarationId(2220),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61166,10 +61274,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 7438, 7560),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7519, 7641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2215),
+            id: DeclarationId(2221),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61195,10 +61303,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 7822, 7947),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7903, 8028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2216),
+            id: DeclarationId(2222),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61214,10 +61322,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10000, 10061),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10081, 10142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2217),
+            id: DeclarationId(2223),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61239,10 +61347,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10628, 10740),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10709, 10821),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2218),
+            id: DeclarationId(2224),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61264,10 +61372,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11336, 11415),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11417, 11496),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2219),
+            id: DeclarationId(2225),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61293,10 +61401,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11635, 11748),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11716, 11829),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2220),
+            id: DeclarationId(2226),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61322,10 +61430,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11753, 11889),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11834, 11970),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2221),
+            id: DeclarationId(2227),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61347,10 +61455,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11894, 11976),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11975, 12057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2222),
+            id: DeclarationId(2228),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61372,10 +61480,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11981, 12067),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12062, 12148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2223),
+            id: DeclarationId(2229),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61392,10 +61500,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12146, 12156),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12227, 12237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2224),
+            id: DeclarationId(2230),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61405,7 +61513,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "generated_paths".to_string(),
-                        ty: DeclarationId(2223),
+                        ty: DeclarationId(2229),
                     },
                 ],
             },
@@ -61417,10 +61525,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12072, 12162),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12153, 12243),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2225),
+            id: DeclarationId(2231),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61446,10 +61554,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 13104, 13238),
+            span: SourceSpan::new("src/v3/std/verification.dag", 13185, 13319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2226),
+            id: DeclarationId(2232),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61475,10 +61583,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 13877, 14021),
+            span: SourceSpan::new("src/v3/std/verification.dag", 13958, 14102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2227),
+            id: DeclarationId(2233),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61494,10 +61602,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 14866, 14920),
+            span: SourceSpan::new("src/v3/std/verification.dag", 14947, 15001),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2228),
+            id: DeclarationId(2234),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61514,10 +61622,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15964, 15987),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16045, 16068),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2229),
+            id: DeclarationId(2235),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61534,10 +61642,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16033, 16048),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16114, 16129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2230),
+            id: DeclarationId(2236),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61554,10 +61662,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16304, 16327),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16385, 16408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2231),
+            id: DeclarationId(2237),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61577,7 +61685,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2232),
+            id: DeclarationId(2238),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61591,7 +61699,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 532, 547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2233),
+            id: DeclarationId(2239),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61605,7 +61713,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 550, 561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2234),
+            id: DeclarationId(2240),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61619,7 +61727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2235),
+            id: DeclarationId(2241),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(726),
@@ -61636,7 +61744,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2236),
+            id: DeclarationId(2242),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61650,7 +61758,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5552, 5570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2237),
+            id: DeclarationId(2243),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61664,7 +61772,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5575, 5590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2238),
+            id: DeclarationId(2244),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61678,7 +61786,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5619, 5640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2239),
+            id: DeclarationId(2245),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61692,7 +61800,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5645, 5660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2240),
+            id: DeclarationId(2246),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61706,7 +61814,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7257, 7267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2241),
+            id: DeclarationId(2247),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61720,7 +61828,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7272, 7283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2242),
+            id: DeclarationId(2248),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61734,7 +61842,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7288, 7301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2243),
+            id: DeclarationId(2249),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61748,7 +61856,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7306, 7319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2244),
+            id: DeclarationId(2250),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61762,7 +61870,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7324, 7337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2245),
+            id: DeclarationId(2251),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61776,7 +61884,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7342, 7356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2246),
+            id: DeclarationId(2252),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61790,7 +61898,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7361, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2247),
+            id: DeclarationId(2253),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61804,7 +61912,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8118, 8135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2248),
+            id: DeclarationId(2254),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61818,7 +61926,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8140, 8150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2249),
+            id: DeclarationId(2255),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61832,7 +61940,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8155, 8159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2250),
+            id: DeclarationId(2256),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61877,7 +61985,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8937, 9509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2251),
+            id: DeclarationId(2257),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61910,7 +62018,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9514, 9696),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2252),
+            id: DeclarationId(2258),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -64972,7 +65080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(379),
             Port {
                 id: PortId(379),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2231))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2237))),
                 produced_by: Some(NodeId(279)),
             },
         );

From 12875fb55c90f359f60a1c94ed56d009da43cd43 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gunb.ai>
Date: Mon, 4 May 2026 19:45:28 -0400
Subject: [PATCH 17/18] WIP: keen-swift-519

---
 src/v3/compiler/src/bootstrap_generated.rs | 1245 +++++++++++---------
 1 file changed, 671 insertions(+), 574 deletions(-)

diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs
index 9f0b8e14728..b46490b4e90 100644
--- a/src/v3/compiler/src/bootstrap_generated.rs
+++ b/src/v3/compiler/src/bootstrap_generated.rs
@@ -8,7 +8,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag {
         ports: bootstrapped_fixture_dag_ports(),
         diagnostics: bootstrapped_fixture_dag_diagnostics(),
         next_node_id: 315,
-        next_declaration_id: 2342,
+        next_declaration_id: 2346,
         next_port_id: 420,
         primitives: PrimitiveCache::default(),
         substrate_markers: SubstrateMarkers::default(),
@@ -24,7 +24,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag {
         emit_model_variants: EmitModelVariants::default(),
         clusters: bootstrapped_fixture_dag_clusters(),
         optional_match_disjs: bootstrapped_fixture_dag_optional_match_disjs(),
-        declaration_append_begin_after_bootstrap: 2342,
+        declaration_append_begin_after_bootstrap: 2346,
     }
 }
 
@@ -4127,7 +4127,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
 #[allow(clippy::vec_init_then_push)]
 fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
     {
-        let mut declarations = Vec::with_capacity(2342);
+        let mut declarations = Vec::with_capacity(2346);
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -28003,37 +28003,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "Call".to_string(),
                         ty: DeclarationId(2101),
                     },
+                    Field {
+                        label: "PathCall".to_string(),
+                        ty: DeclarationId(2105),
+                    },
                     Field {
                         label: "VariantRecord".to_string(),
-                        ty: DeclarationId(2103),
+                        ty: DeclarationId(2107),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(2105),
+                        ty: DeclarationId(2109),
                     },
                     Field {
                         label: "Lambda".to_string(),
-                        ty: DeclarationId(2107),
+                        ty: DeclarationId(2111),
                     },
                     Field {
                         label: "If".to_string(),
-                        ty: DeclarationId(2108),
+                        ty: DeclarationId(2112),
                     },
                     Field {
                         label: "Match".to_string(),
-                        ty: DeclarationId(2110),
+                        ty: DeclarationId(2114),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(2112),
+                        ty: DeclarationId(2116),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(2114),
+                        ty: DeclarationId(2118),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(2116),
+                        ty: DeclarationId(2120),
                     },
                 ],
             },
@@ -28045,7 +28049,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 4713, 7852),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 4713, 8532),
         });
         declarations.push(Declaration {
             id: DeclarationId(1031),
@@ -28054,43 +28058,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Let".to_string(),
-                        ty: DeclarationId(2118),
+                        ty: DeclarationId(2122),
                     },
                     Field {
                         label: "Fn".to_string(),
-                        ty: DeclarationId(2121),
+                        ty: DeclarationId(2125),
                     },
                     Field {
                         label: "FnExternalBody".to_string(),
-                        ty: DeclarationId(2124),
+                        ty: DeclarationId(2128),
                     },
                     Field {
                         label: "Data".to_string(),
-                        ty: DeclarationId(2126),
+                        ty: DeclarationId(2130),
                     },
                     Field {
                         label: "Module".to_string(),
-                        ty: DeclarationId(2128),
+                        ty: DeclarationId(2132),
                     },
                     Field {
                         label: "Import".to_string(),
-                        ty: DeclarationId(2131),
+                        ty: DeclarationId(2135),
                     },
                     Field {
                         label: "TypeAtom".to_string(),
-                        ty: DeclarationId(2133),
+                        ty: DeclarationId(2137),
                     },
                     Field {
                         label: "TypeRecord".to_string(),
-                        ty: DeclarationId(2136),
+                        ty: DeclarationId(2140),
                     },
                     Field {
                         label: "TypeSum".to_string(),
-                        ty: DeclarationId(2140),
+                        ty: DeclarationId(2144),
                     },
                     Field {
                         label: "TypeAlias".to_string(),
-                        ty: DeclarationId(2143),
+                        ty: DeclarationId(2147),
                     },
                 ],
             },
@@ -28102,7 +28106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 8721, 10039),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9401, 10719),
         });
         declarations.push(Declaration {
             id: DeclarationId(1032),
@@ -28338,7 +28342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2144)),
+            meta_tag: Some(DeclarationId(2148)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -29016,23 +29020,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LiteralValue".to_string(),
-                        ty: DeclarationId(2145),
+                        ty: DeclarationId(2149),
                     },
                     Field {
                         label: "RecordValue".to_string(),
-                        ty: DeclarationId(2147),
+                        ty: DeclarationId(2151),
                     },
                     Field {
                         label: "VariantValue".to_string(),
-                        ty: DeclarationId(2148),
+                        ty: DeclarationId(2152),
                     },
                     Field {
                         label: "NodeRef".to_string(),
-                        ty: DeclarationId(2149),
+                        ty: DeclarationId(2153),
                     },
                     Field {
                         label: "CardinalityValue".to_string(),
-                        ty: DeclarationId(2150),
+                        ty: DeclarationId(2154),
                     },
                 ],
             },
@@ -29085,7 +29089,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bindings".to_string(),
-                    ty: DeclarationId(2151),
+                    ty: DeclarationId(2155),
                 }],
             },
             type_params: vec![],
@@ -29104,7 +29108,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "frames".to_string(),
-                    ty: DeclarationId(2152),
+                    ty: DeclarationId(2156),
                 }],
             },
             type_params: vec![],
@@ -29142,7 +29146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "ApplicativeOrder".to_string(),
-                    ty: DeclarationId(2153),
+                    ty: DeclarationId(2157),
                 }],
             },
             type_params: vec![],
@@ -29161,7 +29165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LeftFirst".to_string(),
-                    ty: DeclarationId(2154),
+                    ty: DeclarationId(2158),
                 }],
             },
             type_params: vec![],
@@ -29207,7 +29211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/runtime.dag", 6042, 6153),
         });
-        declarations.push(Declaration { id: DeclarationId(1049), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(607), arguments: vec![TemplateArgument { parameter: DeclarationId(608), value: DeclarationId(947) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2155)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(238)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(240)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2026), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2026), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2026), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2026), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(260)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(266)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) });
+        declarations.push(Declaration { id: DeclarationId(1049), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(607), arguments: vec![TemplateArgument { parameter: DeclarationId(608), value: DeclarationId(947) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2159)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(238)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(240)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2026), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2026), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2026), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2026), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(260)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(266)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) });
         declarations.push(Declaration {
             id: DeclarationId(1050),
             name: Some("InputField".to_string()),
@@ -29277,7 +29281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2156),
+                        ty: DeclarationId(2160),
                     },
                     Field {
                         label: "endpoint".to_string(),
@@ -29302,15 +29306,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Strict".to_string(),
-                        ty: DeclarationId(2164),
+                        ty: DeclarationId(2168),
                     },
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2165),
+                        ty: DeclarationId(2169),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2166),
+                        ty: DeclarationId(2170),
                     },
                 ],
             },
@@ -29408,8 +29412,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1059),
             name: Some("optional_evidence_meet".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2157), DeclarationId(2158)],
-                output: DeclarationId(2159),
+                inputs: vec![DeclarationId(2161), DeclarationId(2162)],
+                output: DeclarationId(2163),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2388,
@@ -29430,8 +29434,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1060),
             name: Some("map_evidence_merge_at".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2160), DeclarationId(197), DeclarationId(1054)],
-                output: DeclarationId(2161),
+                inputs: vec![DeclarationId(2164), DeclarationId(197), DeclarationId(1054)],
+                output: DeclarationId(2165),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2733,
@@ -29455,23 +29459,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2167),
+                        ty: DeclarationId(2171),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2168),
+                        ty: DeclarationId(2172),
                     },
                     Field {
                         label: "ArithmeticValue".to_string(),
-                        ty: DeclarationId(2169),
+                        ty: DeclarationId(2173),
                     },
                     Field {
                         label: "TokenPosition".to_string(),
-                        ty: DeclarationId(2170),
+                        ty: DeclarationId(2174),
                     },
                     Field {
                         label: "SetCardinality".to_string(),
-                        ty: DeclarationId(2171),
+                        ty: DeclarationId(2175),
                     },
                 ],
             },
@@ -29492,11 +29496,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OneStep".to_string(),
-                        ty: DeclarationId(2172),
+                        ty: DeclarationId(2176),
                     },
                     Field {
                         label: "AdditionalStep".to_string(),
-                        ty: DeclarationId(2173),
+                        ty: DeclarationId(2177),
                     },
                 ],
             },
@@ -29517,11 +29521,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DivideByTwo".to_string(),
-                        ty: DeclarationId(2174),
+                        ty: DeclarationId(2178),
                     },
                     Field {
                         label: "StrictlyLarger".to_string(),
-                        ty: DeclarationId(2175),
+                        ty: DeclarationId(2179),
                     },
                 ],
             },
@@ -29584,7 +29588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("positive_descent_amount_from_positive_int".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2162),
+                output: DeclarationId(2166),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     5902,
@@ -29606,7 +29610,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("proportional_divisor_from_int_at_least_two".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2163),
+                output: DeclarationId(2167),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6342,
@@ -29630,31 +29634,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ChildAccessor".to_string(),
-                        ty: DeclarationId(2176),
+                        ty: DeclarationId(2180),
                     },
                     Field {
                         label: "ListShrink".to_string(),
-                        ty: DeclarationId(2177),
+                        ty: DeclarationId(2181),
                     },
                     Field {
                         label: "ArithmeticSubtractDescent".to_string(),
-                        ty: DeclarationId(2178),
+                        ty: DeclarationId(2182),
                     },
                     Field {
                         label: "ArithmeticDivideDescent".to_string(),
-                        ty: DeclarationId(2179),
+                        ty: DeclarationId(2183),
                     },
                     Field {
                         label: "ParserAdvance".to_string(),
-                        ty: DeclarationId(2180),
+                        ty: DeclarationId(2184),
                     },
                     Field {
                         label: "SetRemoval".to_string(),
-                        ty: DeclarationId(2181),
+                        ty: DeclarationId(2185),
                     },
                     Field {
                         label: "FoldIteration".to_string(),
-                        ty: DeclarationId(2182),
+                        ty: DeclarationId(2186),
                     },
                 ],
             },
@@ -29674,7 +29678,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "dimensions".to_string(),
-                    ty: DeclarationId(2183),
+                    ty: DeclarationId(2187),
                 }],
             },
             type_params: vec![],
@@ -29702,7 +29706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(2184),
+                        ty: DeclarationId(2188),
                     },
                 ],
             },
@@ -29723,183 +29727,183 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2185),
+                        ty: DeclarationId(2189),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2186),
+                        ty: DeclarationId(2190),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2187),
+                        ty: DeclarationId(2191),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2188),
+                        ty: DeclarationId(2192),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2189),
+                        ty: DeclarationId(2193),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2190),
+                        ty: DeclarationId(2194),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2191),
+                        ty: DeclarationId(2195),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2192),
+                        ty: DeclarationId(2196),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2193),
+                        ty: DeclarationId(2197),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2194),
+                        ty: DeclarationId(2198),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2195),
+                        ty: DeclarationId(2199),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2196),
+                        ty: DeclarationId(2200),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2197),
+                        ty: DeclarationId(2201),
                     },
                     Field {
                         label: "Ident".to_string(),
-                        ty: DeclarationId(2198),
+                        ty: DeclarationId(2202),
                     },
                     Field {
                         label: "IntLit".to_string(),
-                        ty: DeclarationId(2199),
+                        ty: DeclarationId(2203),
                     },
                     Field {
                         label: "StringLit".to_string(),
-                        ty: DeclarationId(2200),
+                        ty: DeclarationId(2204),
                     },
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2201),
+                        ty: DeclarationId(2205),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2202),
+                        ty: DeclarationId(2206),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2203),
+                        ty: DeclarationId(2207),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2204),
+                        ty: DeclarationId(2208),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2205),
+                        ty: DeclarationId(2209),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2206),
+                        ty: DeclarationId(2210),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2207),
+                        ty: DeclarationId(2211),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2208),
+                        ty: DeclarationId(2212),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2209),
+                        ty: DeclarationId(2213),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2210),
+                        ty: DeclarationId(2214),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2211),
+                        ty: DeclarationId(2215),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2212),
+                        ty: DeclarationId(2216),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2213),
+                        ty: DeclarationId(2217),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2214),
+                        ty: DeclarationId(2218),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2215),
+                        ty: DeclarationId(2219),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2216),
+                        ty: DeclarationId(2220),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2217),
+                        ty: DeclarationId(2221),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2218),
+                        ty: DeclarationId(2222),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2219),
+                        ty: DeclarationId(2223),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2220),
+                        ty: DeclarationId(2224),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2221),
+                        ty: DeclarationId(2225),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2222),
+                        ty: DeclarationId(2226),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2223),
+                        ty: DeclarationId(2227),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2224),
+                        ty: DeclarationId(2228),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2225),
+                        ty: DeclarationId(2229),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2226),
+                        ty: DeclarationId(2230),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2227),
+                        ty: DeclarationId(2231),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2228),
+                        ty: DeclarationId(2232),
                     },
                     Field {
                         label: "Eof".to_string(),
-                        ty: DeclarationId(2229),
+                        ty: DeclarationId(2233),
                     },
                 ],
             },
@@ -29945,55 +29949,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2230),
+                        ty: DeclarationId(2234),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2231),
+                        ty: DeclarationId(2235),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2232),
+                        ty: DeclarationId(2236),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2233),
+                        ty: DeclarationId(2237),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2234),
+                        ty: DeclarationId(2238),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2235),
+                        ty: DeclarationId(2239),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2236),
+                        ty: DeclarationId(2240),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2237),
+                        ty: DeclarationId(2241),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2238),
+                        ty: DeclarationId(2242),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2239),
+                        ty: DeclarationId(2243),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2240),
+                        ty: DeclarationId(2244),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2241),
+                        ty: DeclarationId(2245),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2242),
+                        ty: DeclarationId(2246),
                     },
                 ],
             },
@@ -30014,115 +30018,115 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2243),
+                        ty: DeclarationId(2247),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2244),
+                        ty: DeclarationId(2248),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2245),
+                        ty: DeclarationId(2249),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2246),
+                        ty: DeclarationId(2250),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2247),
+                        ty: DeclarationId(2251),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2248),
+                        ty: DeclarationId(2252),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2249),
+                        ty: DeclarationId(2253),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2250),
+                        ty: DeclarationId(2254),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2251),
+                        ty: DeclarationId(2255),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2252),
+                        ty: DeclarationId(2256),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2253),
+                        ty: DeclarationId(2257),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2254),
+                        ty: DeclarationId(2258),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2255),
+                        ty: DeclarationId(2259),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2256),
+                        ty: DeclarationId(2260),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2257),
+                        ty: DeclarationId(2261),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2258),
+                        ty: DeclarationId(2262),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2259),
+                        ty: DeclarationId(2263),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2260),
+                        ty: DeclarationId(2264),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2261),
+                        ty: DeclarationId(2265),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2262),
+                        ty: DeclarationId(2266),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2263),
+                        ty: DeclarationId(2267),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2264),
+                        ty: DeclarationId(2268),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2265),
+                        ty: DeclarationId(2269),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2266),
+                        ty: DeclarationId(2270),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2267),
+                        ty: DeclarationId(2271),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2268),
+                        ty: DeclarationId(2272),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2269),
+                        ty: DeclarationId(2273),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2270),
+                        ty: DeclarationId(2274),
                     },
                 ],
             },
@@ -30337,43 +30341,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2274),
+                        ty: DeclarationId(2278),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2275),
+                        ty: DeclarationId(2279),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2276),
+                        ty: DeclarationId(2280),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2277),
+                        ty: DeclarationId(2281),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(2278),
+                        ty: DeclarationId(2282),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2279),
+                        ty: DeclarationId(2283),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(2280),
+                        ty: DeclarationId(2284),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(2281),
+                        ty: DeclarationId(2285),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(2282),
+                        ty: DeclarationId(2286),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2283),
+                        ty: DeclarationId(2287),
                     },
                 ],
             },
@@ -30394,11 +30398,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "AnyDetail".to_string(),
-                        ty: DeclarationId(2284),
+                        ty: DeclarationId(2288),
                     },
                     Field {
                         label: "Contains".to_string(),
-                        ty: DeclarationId(2285),
+                        ty: DeclarationId(2289),
                     },
                 ],
             },
@@ -30444,11 +30448,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(2286),
+                        ty: DeclarationId(2290),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(2287),
+                        ty: DeclarationId(2291),
                     },
                 ],
             },
@@ -30469,15 +30473,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Associativity".to_string(),
-                        ty: DeclarationId(2288),
+                        ty: DeclarationId(2292),
                     },
                     Field {
                         label: "Commutativity".to_string(),
-                        ty: DeclarationId(2289),
+                        ty: DeclarationId(2293),
                     },
                     Field {
                         label: "Identity".to_string(),
-                        ty: DeclarationId(2290),
+                        ty: DeclarationId(2294),
                     },
                 ],
             },
@@ -30498,95 +30502,95 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Compiles".to_string(),
-                        ty: DeclarationId(2291),
+                        ty: DeclarationId(2295),
                     },
                     Field {
                         label: "FailsWithDiagnostic".to_string(),
-                        ty: DeclarationId(2292),
+                        ty: DeclarationId(2296),
                     },
                     Field {
                         label: "OutputEquals".to_string(),
-                        ty: DeclarationId(2293),
+                        ty: DeclarationId(2297),
                     },
                     Field {
                         label: "PortHasState".to_string(),
-                        ty: DeclarationId(2294),
+                        ty: DeclarationId(2298),
                     },
                     Field {
                         label: "DeclarationHasRefinement".to_string(),
-                        ty: DeclarationId(2295),
+                        ty: DeclarationId(2299),
                     },
                     Field {
                         label: "CostBounded".to_string(),
-                        ty: DeclarationId(2296),
+                        ty: DeclarationId(2300),
                     },
                     Field {
                         label: "BehavioralObservation".to_string(),
-                        ty: DeclarationId(2297),
+                        ty: DeclarationId(2301),
                     },
                     Field {
                         label: "MockBackedInvariant".to_string(),
-                        ty: DeclarationId(2298),
+                        ty: DeclarationId(2302),
                     },
                     Field {
                         label: "ExecuteCommand".to_string(),
-                        ty: DeclarationId(2300),
+                        ty: DeclarationId(2304),
                     },
                     Field {
                         label: "ForAllTargets".to_string(),
-                        ty: DeclarationId(2302),
+                        ty: DeclarationId(2306),
                     },
                     Field {
                         label: "LensOutputEquals".to_string(),
-                        ty: DeclarationId(2303),
+                        ty: DeclarationId(2307),
                     },
                     Field {
                         label: "DifferentialEquals".to_string(),
-                        ty: DeclarationId(2304),
+                        ty: DeclarationId(2308),
                     },
                     Field {
                         label: "SymbolicCostExprEquals".to_string(),
-                        ty: DeclarationId(2305),
+                        ty: DeclarationId(2309),
                     },
                     Field {
                         label: "BinaryDimensionReportEquals".to_string(),
-                        ty: DeclarationId(2306),
+                        ty: DeclarationId(2310),
                     },
                     Field {
                         label: "AlgebraicLaw".to_string(),
-                        ty: DeclarationId(2307),
+                        ty: DeclarationId(2311),
                     },
                     Field {
                         label: "CensusBoundCheck".to_string(),
-                        ty: DeclarationId(2308),
+                        ty: DeclarationId(2312),
                     },
                     Field {
                         label: "CensusSubsetCount".to_string(),
-                        ty: DeclarationId(2309),
+                        ty: DeclarationId(2313),
                     },
                     Field {
                         label: "FixedPointConverges".to_string(),
-                        ty: DeclarationId(2310),
+                        ty: DeclarationId(2314),
                     },
                     Field {
                         label: "RatchetZero".to_string(),
-                        ty: DeclarationId(2311),
+                        ty: DeclarationId(2315),
                     },
                     Field {
                         label: "GeneratedFromDag".to_string(),
-                        ty: DeclarationId(2313),
+                        ty: DeclarationId(2317),
                     },
                     Field {
                         label: "ReleaseDeferredClaim".to_string(),
-                        ty: DeclarationId(2314),
+                        ty: DeclarationId(2318),
                     },
                     Field {
                         label: "SubstrateResearchDeferredClaim".to_string(),
-                        ty: DeclarationId(2315),
+                        ty: DeclarationId(2319),
                     },
                     Field {
                         label: "BridgeLedgerZero".to_string(),
-                        ty: DeclarationId(2316),
+                        ty: DeclarationId(2320),
                     },
                 ],
             },
@@ -30656,7 +30660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2317),
+                        ty: DeclarationId(2321),
                     },
                 ],
             },
@@ -30681,7 +30685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "claims".to_string(),
-                        ty: DeclarationId(2318),
+                        ty: DeclarationId(2322),
                     },
                 ],
             },
@@ -30706,7 +30710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "resources".to_string(),
-                        ty: DeclarationId(2319),
+                        ty: DeclarationId(2323),
                     },
                 ],
             },
@@ -30725,7 +30729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("claim_obligation_resources".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1094)],
-                output: DeclarationId(2271),
+                output: DeclarationId(2275),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     16852,
@@ -30768,8 +30772,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1099),
             name: Some("materialize_test_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2272)],
-                output: DeclarationId(2273),
+                inputs: vec![DeclarationId(2276)],
+                output: DeclarationId(2277),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     17094,
@@ -30791,7 +30795,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("behavior_spine".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(748)],
-                output: DeclarationId(2320),
+                output: DeclarationId(2324),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(280))),
             },
             type_params: vec![],
@@ -49347,15 +49351,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SnapshotSurface".to_string(),
-                        ty: DeclarationId(2321),
+                        ty: DeclarationId(2325),
                     },
                     Field {
                         label: "SnapshotDag".to_string(),
-                        ty: DeclarationId(2322),
+                        ty: DeclarationId(2326),
                     },
                     Field {
                         label: "SnapshotText".to_string(),
-                        ty: DeclarationId(2323),
+                        ty: DeclarationId(2327),
                     },
                 ],
             },
@@ -49571,7 +49575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2321),
+                            constructor: DeclarationId(2325),
                             payload: vec![],
                         },
                     ),
@@ -49606,7 +49610,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2322),
+                            constructor: DeclarationId(2326),
                             payload: vec![],
                         },
                     ),
@@ -49641,7 +49645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2322),
+                            constructor: DeclarationId(2326),
                             payload: vec![],
                         },
                     ),
@@ -49676,7 +49680,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2322),
+                            constructor: DeclarationId(2326),
                             payload: vec![],
                         },
                     ),
@@ -49711,7 +49715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2322),
+                            constructor: DeclarationId(2326),
                             payload: vec![],
                         },
                     ),
@@ -49746,7 +49750,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2323),
+                            constructor: DeclarationId(2327),
                             payload: vec![],
                         },
                     ),
@@ -49896,7 +49900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("from_symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(2324),
+                output: DeclarationId(2328),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/operators.dag",
                     156,
@@ -50312,11 +50316,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OrderedRingAlgebra".to_string(),
-                        ty: DeclarationId(2325),
+                        ty: DeclarationId(2329),
                     },
                     Field {
                         label: "SemiringAlgebra".to_string(),
-                        ty: DeclarationId(2326),
+                        ty: DeclarationId(2330),
                     },
                 ],
             },
@@ -50337,11 +50341,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BooleanAlgebraAlgebra".to_string(),
-                        ty: DeclarationId(2327),
+                        ty: DeclarationId(2331),
                     },
                     Field {
                         label: "TerminalAlgebra".to_string(),
-                        ty: DeclarationId(2328),
+                        ty: DeclarationId(2332),
                     },
                 ],
             },
@@ -50362,31 +50366,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BitCarrier".to_string(),
-                        ty: DeclarationId(2329),
+                        ty: DeclarationId(2333),
                     },
                     Field {
                         label: "ByteCarrier".to_string(),
-                        ty: DeclarationId(2330),
+                        ty: DeclarationId(2334),
                     },
                     Field {
                         label: "Word16Carrier".to_string(),
-                        ty: DeclarationId(2331),
+                        ty: DeclarationId(2335),
                     },
                     Field {
                         label: "Word32Carrier".to_string(),
-                        ty: DeclarationId(2332),
+                        ty: DeclarationId(2336),
                     },
                     Field {
                         label: "Word64Carrier".to_string(),
-                        ty: DeclarationId(2333),
+                        ty: DeclarationId(2337),
                     },
                     Field {
                         label: "Word128Carrier".to_string(),
-                        ty: DeclarationId(2334),
+                        ty: DeclarationId(2338),
                     },
                     Field {
                         label: "TerminalCarrier".to_string(),
-                        ty: DeclarationId(2335),
+                        ty: DeclarationId(2339),
                     },
                 ],
             },
@@ -50407,15 +50411,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TwoComplementWrap".to_string(),
-                        ty: DeclarationId(2336),
+                        ty: DeclarationId(2340),
                     },
                     Field {
                         label: "Saturating".to_string(),
-                        ty: DeclarationId(2337),
+                        ty: DeclarationId(2341),
                     },
                     Field {
                         label: "Trap".to_string(),
-                        ty: DeclarationId(2338),
+                        ty: DeclarationId(2342),
                     },
                 ],
             },
@@ -50436,11 +50440,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IntegerPrimitive".to_string(),
-                        ty: DeclarationId(2339),
+                        ty: DeclarationId(2343),
                     },
                     Field {
                         label: "NonIntegerPrimitive".to_string(),
-                        ty: DeclarationId(2340),
+                        ty: DeclarationId(2344),
                     },
                 ],
             },
@@ -50466,83 +50470,83 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2341)),
+            meta_tag: Some(DeclarationId(2345)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
                 FieldValue::Variant {
-                    constructor: DeclarationId(2339),
+                    constructor: DeclarationId(2343),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2325),
+                            constructor: DeclarationId(2329),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2330),
+                            constructor: DeclarationId(2334),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("-128".to_string())),
                         FieldValue::Literal(LiteralBits::String("127".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2336),
+                            constructor: DeclarationId(2340),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2339),
+                    constructor: DeclarationId(2343),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2325),
+                            constructor: DeclarationId(2329),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2331),
+                            constructor: DeclarationId(2335),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("-32768".to_string())),
                         FieldValue::Literal(LiteralBits::String("32767".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2336),
+                            constructor: DeclarationId(2340),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2339),
+                    constructor: DeclarationId(2343),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2325),
+                            constructor: DeclarationId(2329),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2332),
+                            constructor: DeclarationId(2336),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("-2147483648".to_string())),
                         FieldValue::Literal(LiteralBits::String("2147483647".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2336),
+                            constructor: DeclarationId(2340),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2339),
+                    constructor: DeclarationId(2343),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2325),
+                            constructor: DeclarationId(2329),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2333),
+                            constructor: DeclarationId(2337),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -50551,21 +50555,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2336),
+                            constructor: DeclarationId(2340),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2339),
+                    constructor: DeclarationId(2343),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2325),
+                            constructor: DeclarationId(2329),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2334),
+                            constructor: DeclarationId(2338),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -50576,84 +50580,84 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2336),
+                            constructor: DeclarationId(2340),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2339),
+                    constructor: DeclarationId(2343),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2326),
+                            constructor: DeclarationId(2330),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2330),
+                            constructor: DeclarationId(2334),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("255".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2336),
+                            constructor: DeclarationId(2340),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2339),
+                    constructor: DeclarationId(2343),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2326),
+                            constructor: DeclarationId(2330),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2331),
+                            constructor: DeclarationId(2335),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("65535".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2336),
+                            constructor: DeclarationId(2340),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2339),
+                    constructor: DeclarationId(2343),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2326),
+                            constructor: DeclarationId(2330),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2332),
+                            constructor: DeclarationId(2336),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("4294967295".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2336),
+                            constructor: DeclarationId(2340),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2339),
+                    constructor: DeclarationId(2343),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2326),
+                            constructor: DeclarationId(2330),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2333),
+                            constructor: DeclarationId(2337),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -50662,36 +50666,36 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2336),
+                            constructor: DeclarationId(2340),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2340),
+                    constructor: DeclarationId(2344),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("bool".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2327),
+                            constructor: DeclarationId(2331),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2329),
+                            constructor: DeclarationId(2333),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2340),
+                    constructor: DeclarationId(2344),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("()".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2328),
+                            constructor: DeclarationId(2332),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2335),
+                            constructor: DeclarationId(2339),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -61845,7 +61849,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 template: DeclarationId(607),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(608),
-                    value: DeclarationId(1024),
+                    value: DeclarationId(197),
                 }],
             },
             type_params: vec![],
@@ -61856,11 +61860,104 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5082, 5106),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5597, 5609),
         });
         declarations.push(Declaration {
             id: DeclarationId(2103),
             name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(607),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(608),
+                    value: DeclarationId(132),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5631, 5647),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2104),
+            name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(607),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(608),
+                    value: DeclarationId(1030),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5660, 5677),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2105),
+            name: None,
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "segments".to_string(),
+                        ty: DeclarationId(2102),
+                    },
+                    Field {
+                        label: "segment_spans".to_string(),
+                        ty: DeclarationId(2103),
+                    },
+                    Field {
+                        label: "args".to_string(),
+                        ty: DeclarationId(2104),
+                    },
+                    Field {
+                        label: "span".to_string(),
+                        ty: DeclarationId(132),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5570, 5706),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2106),
+            name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(607),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(608),
+                    value: DeclarationId(1024),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5762, 5786),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2107),
+            name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
@@ -61869,7 +61966,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2102),
+                        ty: DeclarationId(2106),
                     },
                     Field {
                         label: "span".to_string(),
@@ -61885,10 +61982,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5031, 5135),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5711, 5815),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2104),
+            id: DeclarationId(2108),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61905,10 +62002,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5186, 5203),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5866, 5883),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2105),
+            id: DeclarationId(2109),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61918,7 +62015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2104),
+                        ty: DeclarationId(2108),
                     },
                     Field {
                         label: "span".to_string(),
@@ -61934,10 +62031,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5140, 5232),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5820, 5912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2106),
+            id: DeclarationId(2110),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -61954,16 +62051,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5260, 5272),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5940, 5952),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2107),
+            id: DeclarationId(2111),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2106),
+                        ty: DeclarationId(2110),
                     },
                     Field {
                         label: "body".to_string(),
@@ -61983,10 +62080,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5237, 5325),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5917, 6005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2108),
+            id: DeclarationId(2112),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62016,10 +62113,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5330, 5449),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6010, 6129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2109),
+            id: DeclarationId(2113),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62036,10 +62133,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5503, 5524),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6183, 6204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2110),
+            id: DeclarationId(2114),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62049,7 +62146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "arms".to_string(),
-                        ty: DeclarationId(2109),
+                        ty: DeclarationId(2113),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62065,10 +62162,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5454, 5553),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6134, 6233),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2111),
+            id: DeclarationId(2115),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62085,16 +62182,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5581, 5605),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6261, 6285),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2112),
+            id: DeclarationId(2116),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2111),
+                        ty: DeclarationId(2115),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62110,10 +62207,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5558, 5634),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6238, 6314),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2113),
+            id: DeclarationId(2117),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62130,16 +62227,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5662, 5679),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6342, 6359),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2114),
+            id: DeclarationId(2118),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "elements".to_string(),
-                        ty: DeclarationId(2113),
+                        ty: DeclarationId(2117),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62155,10 +62252,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 5639, 5708),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 6319, 6388),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2115),
+            id: DeclarationId(2119),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62175,16 +62272,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 7802, 7823),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 8482, 8503),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2116),
+            id: DeclarationId(2120),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "entries".to_string(),
-                        ty: DeclarationId(2115),
+                        ty: DeclarationId(2119),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62200,10 +62297,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 7781, 7852),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 8461, 8532),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2117),
+            id: DeclarationId(2121),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1023),
@@ -62217,10 +62314,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 8783, 8795),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9463, 9475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2118),
+            id: DeclarationId(2122),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62230,7 +62327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_ann".to_string(),
-                        ty: DeclarationId(2117),
+                        ty: DeclarationId(2121),
                     },
                     Field {
                         label: "expr".to_string(),
@@ -62246,10 +62343,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 8742, 8825),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9422, 9505),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2119),
+            id: DeclarationId(2123),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62266,10 +62363,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 8873, 8885),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9553, 9565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2120),
+            id: DeclarationId(2124),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62286,10 +62383,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 8900, 8918),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9580, 9598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2121),
+            id: DeclarationId(2125),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62299,11 +62396,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2119),
+                        ty: DeclarationId(2123),
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2120),
+                        ty: DeclarationId(2124),
                     },
                     Field {
                         label: "return_type".to_string(),
@@ -62327,10 +62424,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 8830, 9002),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9510, 9682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2122),
+            id: DeclarationId(2126),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62347,10 +62444,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9062, 9074),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9742, 9754),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2123),
+            id: DeclarationId(2127),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62367,10 +62464,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9089, 9107),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9769, 9787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2124),
+            id: DeclarationId(2128),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62380,11 +62477,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2122),
+                        ty: DeclarationId(2126),
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2123),
+                        ty: DeclarationId(2127),
                     },
                     Field {
                         label: "return_type".to_string(),
@@ -62408,10 +62505,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9007, 9195),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9687, 9875),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2125),
+            id: DeclarationId(2129),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1030),
@@ -62425,10 +62522,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9260, 9272),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9940, 9952),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2126),
+            id: DeclarationId(2130),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62442,7 +62539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(2125),
+                        ty: DeclarationId(2129),
                     },
                     Field {
                         label: "body_span".to_string(),
@@ -62462,10 +62559,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9200, 9329),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9880, 10009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2127),
+            id: DeclarationId(2131),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62482,16 +62579,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9349, 9361),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10029, 10041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2128),
+            id: DeclarationId(2132),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2127),
+                        ty: DeclarationId(2131),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62507,10 +62604,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9334, 9381),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10014, 10061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2129),
+            id: DeclarationId(2133),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62527,10 +62624,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9407, 9419),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10087, 10099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2130),
+            id: DeclarationId(2134),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62547,20 +62644,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9433, 9445),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10113, 10125),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2131),
+            id: DeclarationId(2135),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2129),
+                        ty: DeclarationId(2133),
                     },
                     Field {
                         label: "names".to_string(),
-                        ty: DeclarationId(2130),
+                        ty: DeclarationId(2134),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62576,10 +62673,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9386, 9474),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10066, 10154),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2132),
+            id: DeclarationId(2136),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62596,10 +62693,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9528, 9540),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10208, 10220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2133),
+            id: DeclarationId(2137),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62609,7 +62706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2132),
+                        ty: DeclarationId(2136),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62625,10 +62722,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9479, 9569),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10159, 10249),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2134),
+            id: DeclarationId(2138),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62645,10 +62742,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9625, 9637),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10305, 10317),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2135),
+            id: DeclarationId(2139),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62665,10 +62762,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9652, 9670),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10332, 10350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2136),
+            id: DeclarationId(2140),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62678,11 +62775,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2134),
+                        ty: DeclarationId(2138),
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2135),
+                        ty: DeclarationId(2139),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62698,10 +62795,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9574, 9699),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10254, 10379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2137),
+            id: DeclarationId(2141),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62718,10 +62815,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9752, 9764),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10432, 10444),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2138),
+            id: DeclarationId(2142),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62738,10 +62835,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9781, 9801),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10461, 10481),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2139),
+            id: DeclarationId(2143),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1023),
@@ -62755,10 +62852,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9818, 9830),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10498, 10510),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2140),
+            id: DeclarationId(2144),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62768,15 +62865,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2137),
+                        ty: DeclarationId(2141),
                     },
                     Field {
                         label: "variants".to_string(),
-                        ty: DeclarationId(2138),
+                        ty: DeclarationId(2142),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(2139),
+                        ty: DeclarationId(2143),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62792,10 +62889,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9704, 9859),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10384, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2141),
+            id: DeclarationId(2145),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62812,10 +62909,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9914, 9926),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10594, 10606),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2142),
+            id: DeclarationId(2146),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1030),
@@ -62829,10 +62926,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9998, 10010),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10678, 10690),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2143),
+            id: DeclarationId(2147),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62842,7 +62939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2141),
+                        ty: DeclarationId(2145),
                     },
                     Field {
                         label: "nominal_opaque".to_string(),
@@ -62854,7 +62951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "refinement".to_string(),
-                        ty: DeclarationId(2142),
+                        ty: DeclarationId(2146),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62870,10 +62967,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9864, 10039),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10544, 10719),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2144),
+            id: DeclarationId(2148),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62897,7 +62994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2145),
+            id: DeclarationId(2149),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62916,7 +63013,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2132, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2146),
+            id: DeclarationId(2150),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -62936,12 +63033,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2174, 2190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2147),
+            id: DeclarationId(2151),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2146),
+                    ty: DeclarationId(2150),
                 }],
             },
             type_params: vec![],
@@ -62955,7 +63052,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2162, 2191),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2148),
+            id: DeclarationId(2152),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62980,7 +63077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2196, 2247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2149),
+            id: DeclarationId(2153),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62999,7 +63096,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2252, 2267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2150),
+            id: DeclarationId(2154),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63018,7 +63115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2272, 2299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2151),
+            id: DeclarationId(2155),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -63044,7 +63141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 3931, 3949),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2152),
+            id: DeclarationId(2156),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -63064,7 +63161,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 4537, 4552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2153),
+            id: DeclarationId(2157),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63083,7 +63180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5405, 5459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2154),
+            id: DeclarationId(2158),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63097,7 +63194,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5724, 5733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2155),
+            id: DeclarationId(2159),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -63117,7 +63214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3589, 3617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2156),
+            id: DeclarationId(2160),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -63143,7 +63240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/services.dag", 6838, 6861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2157),
+            id: DeclarationId(2161),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1054),
@@ -63160,7 +63257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2329, 2345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2158),
+            id: DeclarationId(2162),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1054),
@@ -63177,7 +63274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2350, 2366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2159),
+            id: DeclarationId(2163),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1054),
@@ -63194,7 +63291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2371, 2387),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2160),
+            id: DeclarationId(2164),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -63220,7 +63317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2632, 2660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2161),
+            id: DeclarationId(2165),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(108),
@@ -63246,7 +63343,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2704, 2732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2162),
+            id: DeclarationId(2166),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1062),
@@ -63263,7 +63360,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5879, 5901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2163),
+            id: DeclarationId(2167),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(1063),
@@ -63280,7 +63377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6321, 6341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2164),
+            id: DeclarationId(2168),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63294,7 +63391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 667, 673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2165),
+            id: DeclarationId(2169),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63308,7 +63405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 678, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2166),
+            id: DeclarationId(2170),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63322,7 +63419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 696, 710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2167),
+            id: DeclarationId(2171),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63341,7 +63438,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3232, 3258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2168),
+            id: DeclarationId(2172),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63360,7 +63457,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3263, 3291),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2169),
+            id: DeclarationId(2173),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63379,7 +63476,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3296, 3329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2170),
+            id: DeclarationId(2174),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63398,7 +63495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3334, 3365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2171),
+            id: DeclarationId(2175),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63417,7 +63514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3370, 3402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2172),
+            id: DeclarationId(2176),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63431,7 +63528,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4409, 4416),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2173),
+            id: DeclarationId(2177),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63450,7 +63547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4421, 4471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2174),
+            id: DeclarationId(2178),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63464,7 +63561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4966, 4977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2175),
+            id: DeclarationId(2179),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63483,7 +63580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4982, 5027),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2176),
+            id: DeclarationId(2180),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63502,7 +63599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7131, 7165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2177),
+            id: DeclarationId(2181),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63521,7 +63618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7170, 7214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2178),
+            id: DeclarationId(2182),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63540,7 +63637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7219, 7277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2179),
+            id: DeclarationId(2183),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63559,7 +63656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7282, 7338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2180),
+            id: DeclarationId(2184),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63578,7 +63675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7343, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2181),
+            id: DeclarationId(2185),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63597,7 +63694,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7381, 7411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2182),
+            id: DeclarationId(2186),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63611,7 +63708,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7416, 7429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2183),
+            id: DeclarationId(2187),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -63631,7 +63728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7469, 7491),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2184),
+            id: DeclarationId(2188),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -63651,7 +63748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7701, 7722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2185),
+            id: DeclarationId(2189),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63665,7 +63762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2186),
+            id: DeclarationId(2190),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63679,7 +63776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2187),
+            id: DeclarationId(2191),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63693,7 +63790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2188),
+            id: DeclarationId(2192),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63707,7 +63804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2189),
+            id: DeclarationId(2193),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63721,7 +63818,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2190),
+            id: DeclarationId(2194),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63735,7 +63832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2191),
+            id: DeclarationId(2195),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63749,7 +63846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2192),
+            id: DeclarationId(2196),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63763,7 +63860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2193),
+            id: DeclarationId(2197),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63777,7 +63874,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2194),
+            id: DeclarationId(2198),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63791,7 +63888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2195),
+            id: DeclarationId(2199),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63805,7 +63902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2196),
+            id: DeclarationId(2200),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63819,7 +63916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 768, 774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2197),
+            id: DeclarationId(2201),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63833,7 +63930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 779, 786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2198),
+            id: DeclarationId(2202),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63852,7 +63949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 791, 804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2199),
+            id: DeclarationId(2203),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63871,7 +63968,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 809, 820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2200),
+            id: DeclarationId(2204),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63890,7 +63987,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 825, 842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2201),
+            id: DeclarationId(2205),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63904,7 +64001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 847, 849),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2202),
+            id: DeclarationId(2206),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63918,7 +64015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 854, 858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2203),
+            id: DeclarationId(2207),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63932,7 +64029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 863, 868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2204),
+            id: DeclarationId(2208),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63946,7 +64043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 873, 875),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2205),
+            id: DeclarationId(2209),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63960,7 +64057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 880, 882),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2206),
+            id: DeclarationId(2210),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63974,7 +64071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 887, 889),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2207),
+            id: DeclarationId(2211),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63988,7 +64085,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 894, 896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2208),
+            id: DeclarationId(2212),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64002,7 +64099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 901, 905),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2209),
+            id: DeclarationId(2213),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64016,7 +64113,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 910, 915),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2210),
+            id: DeclarationId(2214),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64030,7 +64127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 920, 924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2211),
+            id: DeclarationId(2215),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64044,7 +64141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 929, 934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2212),
+            id: DeclarationId(2216),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64058,7 +64155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 939, 945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2213),
+            id: DeclarationId(2217),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64072,7 +64169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 950, 958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2214),
+            id: DeclarationId(2218),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64086,7 +64183,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 963, 968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2215),
+            id: DeclarationId(2219),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64100,7 +64197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 973, 978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2216),
+            id: DeclarationId(2220),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64114,7 +64211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 983, 991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2217),
+            id: DeclarationId(2221),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64128,7 +64225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 996, 1005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2218),
+            id: DeclarationId(2222),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64142,7 +64239,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1010, 1013),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2219),
+            id: DeclarationId(2223),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64156,7 +64253,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1018, 1024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2220),
+            id: DeclarationId(2224),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64170,7 +64267,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1029, 1035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2221),
+            id: DeclarationId(2225),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64184,7 +64281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1040, 1046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2222),
+            id: DeclarationId(2226),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64198,7 +64295,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1051, 1057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2223),
+            id: DeclarationId(2227),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64212,7 +64309,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1062, 1070),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2224),
+            id: DeclarationId(2228),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64226,7 +64323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1075, 1083),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2225),
+            id: DeclarationId(2229),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64240,7 +64337,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1088, 1093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2226),
+            id: DeclarationId(2230),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64254,7 +64351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1098, 1107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2227),
+            id: DeclarationId(2231),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64268,7 +64365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1116),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2228),
+            id: DeclarationId(2232),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64282,7 +64379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1121, 1129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2229),
+            id: DeclarationId(2233),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64296,7 +64393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1134, 1137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2230),
+            id: DeclarationId(2234),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64310,7 +64407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1708, 1713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2231),
+            id: DeclarationId(2235),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64324,7 +64421,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1718, 1722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2232),
+            id: DeclarationId(2236),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64338,7 +64435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1727, 1733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2233),
+            id: DeclarationId(2237),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64352,7 +64449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1738, 1744),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2234),
+            id: DeclarationId(2238),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64366,7 +64463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1749, 1753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2235),
+            id: DeclarationId(2239),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64380,7 +64477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1758, 1764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2236),
+            id: DeclarationId(2240),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64394,7 +64491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1769, 1777),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2237),
+            id: DeclarationId(2241),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64408,7 +64505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1782, 1790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2238),
+            id: DeclarationId(2242),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64422,7 +64519,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1795, 1802),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2239),
+            id: DeclarationId(2243),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64436,7 +64533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1807, 1813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2240),
+            id: DeclarationId(2244),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64450,7 +64547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1818, 1825),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2241),
+            id: DeclarationId(2245),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64464,7 +64561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1830, 1836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2242),
+            id: DeclarationId(2246),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64478,7 +64575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1841, 1848),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2243),
+            id: DeclarationId(2247),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64492,7 +64589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2288, 2290),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2244),
+            id: DeclarationId(2248),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64506,7 +64603,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2295, 2299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2245),
+            id: DeclarationId(2249),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64520,7 +64617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2304, 2309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2246),
+            id: DeclarationId(2250),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64534,7 +64631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2314, 2316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2247),
+            id: DeclarationId(2251),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64548,7 +64645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2321, 2323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2248),
+            id: DeclarationId(2252),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64562,7 +64659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2328, 2330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2249),
+            id: DeclarationId(2253),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64576,7 +64673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2335, 2337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2250),
+            id: DeclarationId(2254),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64590,7 +64687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2342, 2346),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2251),
+            id: DeclarationId(2255),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64604,7 +64701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2351, 2356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2252),
+            id: DeclarationId(2256),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64618,7 +64715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2361, 2365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2253),
+            id: DeclarationId(2257),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64632,7 +64729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2370, 2375),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2254),
+            id: DeclarationId(2258),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64646,7 +64743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2380, 2386),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2255),
+            id: DeclarationId(2259),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64660,7 +64757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2391, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2256),
+            id: DeclarationId(2260),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64674,7 +64771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2404, 2409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2257),
+            id: DeclarationId(2261),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64688,7 +64785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2414, 2419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2258),
+            id: DeclarationId(2262),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64702,7 +64799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2424, 2432),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2259),
+            id: DeclarationId(2263),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64716,7 +64813,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2437, 2446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2260),
+            id: DeclarationId(2264),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64730,7 +64827,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2451, 2454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2261),
+            id: DeclarationId(2265),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64744,7 +64841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2459, 2465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2262),
+            id: DeclarationId(2266),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64758,7 +64855,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2470, 2476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2263),
+            id: DeclarationId(2267),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64772,7 +64869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2481, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2264),
+            id: DeclarationId(2268),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64786,7 +64883,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2492, 2498),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2265),
+            id: DeclarationId(2269),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64800,7 +64897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2503, 2511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2266),
+            id: DeclarationId(2270),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64814,7 +64911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2516, 2524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2267),
+            id: DeclarationId(2271),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64828,7 +64925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2529, 2534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2268),
+            id: DeclarationId(2272),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64842,7 +64939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2539, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2269),
+            id: DeclarationId(2273),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64856,7 +64953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2553, 2557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2270),
+            id: DeclarationId(2274),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64870,7 +64967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2562, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2271),
+            id: DeclarationId(2275),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -64890,7 +64987,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 16828, 16851),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2272),
+            id: DeclarationId(2276),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -64910,7 +65007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 17053, 17068),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2273),
+            id: DeclarationId(2277),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -64930,7 +65027,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 17073, 17093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2274),
+            id: DeclarationId(2278),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64944,7 +65041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2480, 2494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2275),
+            id: DeclarationId(2279),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64958,7 +65055,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2499, 2509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2276),
+            id: DeclarationId(2280),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64972,7 +65069,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2514, 2526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2277),
+            id: DeclarationId(2281),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64986,7 +65083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2531, 2544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2278),
+            id: DeclarationId(2282),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65000,7 +65097,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2549, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2279),
+            id: DeclarationId(2283),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65014,7 +65111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2566, 2578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2280),
+            id: DeclarationId(2284),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65028,7 +65125,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2583, 2605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2281),
+            id: DeclarationId(2285),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65042,7 +65139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2610, 2629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2282),
+            id: DeclarationId(2286),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65056,7 +65153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2634, 2659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2283),
+            id: DeclarationId(2287),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65070,7 +65167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2664, 2687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2284),
+            id: DeclarationId(2288),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65084,7 +65181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3093, 3102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2285),
+            id: DeclarationId(2289),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65103,7 +65200,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3107, 3123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2286),
+            id: DeclarationId(2290),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65117,7 +65214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3782, 3790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2287),
+            id: DeclarationId(2291),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65131,7 +65228,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3795, 3805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2288),
+            id: DeclarationId(2292),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65145,7 +65242,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4620, 4633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2289),
+            id: DeclarationId(2293),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65159,7 +65256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4638, 4651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2290),
+            id: DeclarationId(2294),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65173,7 +65270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4656, 4664),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2291),
+            id: DeclarationId(2295),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65187,7 +65284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4689, 4697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2292),
+            id: DeclarationId(2296),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65206,7 +65303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4702, 4742),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2293),
+            id: DeclarationId(2297),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65225,7 +65322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4747, 4780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2294),
+            id: DeclarationId(2298),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65250,7 +65347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4785, 4863),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2295),
+            id: DeclarationId(2299),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65269,7 +65366,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5029, 5092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2296),
+            id: DeclarationId(2300),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65298,7 +65395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5097, 5188),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2297),
+            id: DeclarationId(2301),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65327,7 +65424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5193, 5325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2298),
+            id: DeclarationId(2302),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65352,7 +65449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5540, 5629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2299),
+            id: DeclarationId(2303),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -65372,7 +65469,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6429, 6441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2300),
+            id: DeclarationId(2304),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65382,7 +65479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2299),
+                        ty: DeclarationId(2303),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -65401,7 +65498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6378, 6475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2301),
+            id: DeclarationId(2305),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -65421,7 +65518,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 7175, 7187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2302),
+            id: DeclarationId(2306),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65431,7 +65528,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2301),
+                        ty: DeclarationId(2305),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -65450,7 +65547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 7125, 7221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2303),
+            id: DeclarationId(2307),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65479,7 +65576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 7519, 7641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2304),
+            id: DeclarationId(2308),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65508,7 +65605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 7903, 8028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2305),
+            id: DeclarationId(2309),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65527,7 +65624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 10081, 10142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2306),
+            id: DeclarationId(2310),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65552,7 +65649,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 10709, 10821),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2307),
+            id: DeclarationId(2311),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65577,7 +65674,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 11417, 11496),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2308),
+            id: DeclarationId(2312),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65606,7 +65703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 11716, 11829),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2309),
+            id: DeclarationId(2313),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65635,7 +65732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 11834, 11970),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2310),
+            id: DeclarationId(2314),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65660,7 +65757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 11975, 12057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2311),
+            id: DeclarationId(2315),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65685,7 +65782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 12062, 12148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2312),
+            id: DeclarationId(2316),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -65705,7 +65802,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 12227, 12237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2313),
+            id: DeclarationId(2317),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65715,7 +65812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "generated_paths".to_string(),
-                        ty: DeclarationId(2312),
+                        ty: DeclarationId(2316),
                     },
                 ],
             },
@@ -65730,7 +65827,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 12153, 12243),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2314),
+            id: DeclarationId(2318),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65759,7 +65856,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 13185, 13319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2315),
+            id: DeclarationId(2319),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65788,7 +65885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 13958, 14102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2316),
+            id: DeclarationId(2320),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65807,7 +65904,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 14947, 15001),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2317),
+            id: DeclarationId(2321),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -65827,7 +65924,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 16045, 16068),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2318),
+            id: DeclarationId(2322),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -65847,7 +65944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 16114, 16129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2319),
+            id: DeclarationId(2323),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -65867,7 +65964,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 16385, 16408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2320),
+            id: DeclarationId(2324),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -65887,7 +65984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2321),
+            id: DeclarationId(2325),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65901,7 +65998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 532, 547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2322),
+            id: DeclarationId(2326),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65915,7 +66012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 550, 561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2323),
+            id: DeclarationId(2327),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65929,7 +66026,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2324),
+            id: DeclarationId(2328),
             name: None,
             connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked(
                 DeclarationId(726),
@@ -65946,7 +66043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2325),
+            id: DeclarationId(2329),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65960,7 +66057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5552, 5570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2326),
+            id: DeclarationId(2330),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65974,7 +66071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5575, 5590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2327),
+            id: DeclarationId(2331),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65988,7 +66085,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5619, 5640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2328),
+            id: DeclarationId(2332),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66002,7 +66099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5645, 5660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2329),
+            id: DeclarationId(2333),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66016,7 +66113,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7257, 7267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2330),
+            id: DeclarationId(2334),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66030,7 +66127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7272, 7283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2331),
+            id: DeclarationId(2335),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66044,7 +66141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7288, 7301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2332),
+            id: DeclarationId(2336),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66058,7 +66155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7306, 7319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2333),
+            id: DeclarationId(2337),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66072,7 +66169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7324, 7337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2334),
+            id: DeclarationId(2338),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66086,7 +66183,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7342, 7356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2335),
+            id: DeclarationId(2339),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66100,7 +66197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7361, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2336),
+            id: DeclarationId(2340),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66114,7 +66211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8118, 8135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2337),
+            id: DeclarationId(2341),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66128,7 +66225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8140, 8150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2338),
+            id: DeclarationId(2342),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66142,7 +66239,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8155, 8159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2339),
+            id: DeclarationId(2343),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -66187,7 +66284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8937, 9509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2340),
+            id: DeclarationId(2344),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -66220,7 +66317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9514, 9696),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2341),
+            id: DeclarationId(2345),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(607),
@@ -69282,7 +69379,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(379),
             Port {
                 id: PortId(379),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2320))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2324))),
                 produced_by: Some(NodeId(279)),
             },
         );

From 87473679806549e87f4dcbcfbea01b07ee8357d3 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gunb.ai>
Date: Mon, 4 May 2026 19:54:42 -0400
Subject: [PATCH 18/18] WIP: keen-swift-519

---
 src/v3/compiler/src/diagnostics.rs | 64 +++++++++++++++++++-----------
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/src/v3/compiler/src/diagnostics.rs b/src/v3/compiler/src/diagnostics.rs
index bc3fe589b3b..24e3574b0bc 100644
--- a/src/v3/compiler/src/diagnostics.rs
+++ b/src/v3/compiler/src/diagnostics.rs
@@ -222,12 +222,13 @@ pub enum Diagnostic {
 
 /// Layer-1 compiler diagnostic kind labels in **declaration order** of [`Diagnostic`].
 ///
-/// The strings are the same as [`Diagnostic::layer1_kind_label`]; crate tests assert this slice
-/// stays aligned with that exhaustive mapping. Integration tests ratchet `CompilerDiagnosticKind`
-/// / `std.verification.DiagnosticKind` in the bootstrap DAG against this slice. When adding a
-/// [`Diagnostic`] variant, `layer1_kind_label` must gain an arm (compile-time exhaustiveness), then
-/// extend this list and the `.dag` closed sums — lens-instance kinds stay on the Layer-2 path
-/// (Q6.5), not here.
+/// This is the **only** source of label strings for [`Diagnostic::layer1_kind_label`], which
+/// indexes this slice using an exhaustive per-variant index match (no wildcard). Crate tests assert
+/// the declaration-order fixture matches those indices; integration tests ratchet
+/// `CompilerDiagnosticKind` / `std.verification.DiagnosticKind` in the bootstrap DAG against this
+/// slice. When adding a [`Diagnostic`] variant, extend this list, add an index arm next to
+/// `layer1_kind_label`, and update the `.dag` closed sums — lens-instance kinds stay on the
+/// Layer-2 path (Q6.5), not here.
 pub const LAYER1_DIAGNOSTIC_KIND_LABELS: &[&str] = &[
     "TokenizerError",
     "ParseError",
@@ -242,27 +243,37 @@ pub const LAYER1_DIAGNOSTIC_KIND_LABELS: &[&str] = &[
 ];
 
 impl Diagnostic {
-    /// Stable Layer-1 kind name for substrate mirrors and test predicates (Q6.5).
+    /// Zero-based declaration index for Layer-1 kind strings (same order as [`Diagnostic`] and
+    /// [`LAYER1_DIAGNOSTIC_KIND_LABELS`]).
     ///
-    /// This match is **exhaustive with no wildcard**: adding a [`Diagnostic`] variant is a
-    /// compile error until a new arm is authored here. [`LAYER1_DIAGNOSTIC_KIND_LABELS`] must stay
-    /// in the same **declaration order** as this enum; crate tests ratchet the slice against
-    /// representative diagnostics via this method.
-    pub fn layer1_kind_label(&self) -> &'static str {
+    /// This match is **exhaustive with no wildcard**: adding a [`Diagnostic`] variant is a compile
+    /// error until a new arm is authored here **and** [`LAYER1_DIAGNOSTIC_KIND_LABELS`] is extended
+    /// by one entry. [`Diagnostic::layer1_kind_label`] reads only from that slice, so the label
+    /// strings have a single authority.
+    fn layer1_declaration_index(&self) -> usize {
         match self {
-            Diagnostic::TokenizerError { .. } => "TokenizerError",
-            Diagnostic::ParseError { .. } => "ParseError",
-            Diagnostic::TypeMismatch { .. } => "TypeMismatch",
-            Diagnostic::ArityMismatch { .. } => "ArityMismatch",
-            Diagnostic::ResolveError { .. } => "ResolveError",
-            Diagnostic::UnitMismatch { .. } => "UnitMismatch",
-            Diagnostic::BranchConditionNotBool { .. } => "BranchConditionNotBool",
-            Diagnostic::MagnitudeOutOfRange { .. } => "MagnitudeOutOfRange",
-            Diagnostic::MalformedIntegerRangeFact { .. } => "MalformedIntegerRangeFact",
-            Diagnostic::NominalOpacityViolation { .. } => "NominalOpacityViolation",
+            Diagnostic::TokenizerError { .. } => 0,
+            Diagnostic::ParseError { .. } => 1,
+            Diagnostic::TypeMismatch { .. } => 2,
+            Diagnostic::ArityMismatch { .. } => 3,
+            Diagnostic::ResolveError { .. } => 4,
+            Diagnostic::UnitMismatch { .. } => 5,
+            Diagnostic::BranchConditionNotBool { .. } => 6,
+            Diagnostic::MagnitudeOutOfRange { .. } => 7,
+            Diagnostic::MalformedIntegerRangeFact { .. } => 8,
+            Diagnostic::NominalOpacityViolation { .. } => 9,
         }
     }
 
+    /// Stable Layer-1 kind name for substrate mirrors and test predicates (Q6.5).
+    ///
+    /// Labels come only from [`LAYER1_DIAGNOSTIC_KIND_LABELS`]; an exhaustive per-variant index
+    /// match selects the row so new enum variants cannot compile without extending the const slice
+    /// and substrate closed sums.
+    pub fn layer1_kind_label(&self) -> &'static str {
+        LAYER1_DIAGNOSTIC_KIND_LABELS[self.layer1_declaration_index()]
+    }
+
     pub fn span(&self) -> &SourceSpan {
         match self {
             Diagnostic::TokenizerError { span, .. }
@@ -939,9 +950,14 @@ mod tests {
             "declaration-order fixture must list every Diagnostic variant exactly once"
         );
         let mut seen = std::collections::HashSet::new();
-        for (diag, expected) in examples.iter().zip(LAYER1_DIAGNOSTIC_KIND_LABELS.iter()) {
+        for (i, diag) in examples.iter().enumerate() {
+            let idx = diag.layer1_declaration_index();
+            assert_eq!(
+                idx, i,
+                "fixture must stay in declaration order and match layer1_declaration_index()"
+            );
             let label = diag.layer1_kind_label();
-            assert_eq!(label, *expected);
+            assert_eq!(label, LAYER1_DIAGNOSTIC_KIND_LABELS[i]);
             assert!(seen.insert(label), "duplicate layer1 label: {label}");
         }
     }